jeka/kiauh
1
0
Fork 0
mirror of https://github.com/dw-0/kiauh.git synced 2025-12-14 11:04:29 +05:00
Code Issues Packages Projects Releases Wiki Activity

func: drop support for switching to moonraker klipper branch (it's obsolete)

Browse Source
This commit is contained in:
th33xitus
2020-10-10 01:22:08 +02:00
parent ccf5b003fe
commit a4a85b1045
4 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kiauh.ini
View File

@@ -3,5 +3,4 @@ backup_before_update=false
previous_origin_state=0 previous_origin_state=0
previous_smoothing_state=0 previous_smoothing_state=0
previous_shaping_state=0 previous_shaping_state=0
previous_moonraker_state=0 logupload_accepted=false
previous_dev_moonraker_state=0

16
kiauh.sh
View File

@@ -2,14 +2,18 @@
clear clear
set -e set -e
### set some variables ### set color variables
ERROR_MSG=""
green=$(echo -en "\e[92m") green=$(echo -en "\e[92m")
yellow=$(echo -en "\e[93m") yellow=$(echo -en "\e[93m")
red=$(echo -en "\e[91m") red=$(echo -en "\e[91m")
cyan=$(echo -en "\e[96m") cyan=$(echo -en "\e[96m")
default=$(echo -en "\e[97m") default=$(echo -en "\e[97m")
### sourcing all additional scripts
SRCDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
for script in "${SRCDIR}/kiauh/scripts/"*.sh; do . $script; done
for script in "${SRCDIR}/kiauh/scripts/ui/"*.sh; do . $script; done
### set important directories ### set important directories
#klipper #klipper
KLIPPER_DIR=${HOME}/klipper KLIPPER_DIR=${HOME}/klipper
@@ -39,7 +43,7 @@ OCTOPRINT_CFG_DIR=${HOME}/.octoprint
OCTOPRINT_SERVICE1=/etc/init.d/octoprint OCTOPRINT_SERVICE1=/etc/init.d/octoprint
OCTOPRINT_SERVICE2=/etc/default/octoprint OCTOPRINT_SERVICE2=/etc/default/octoprint
#misc #misc
INI_FILE=${HOME}/kiauh/kiauh.ini INI_FILE=${SRCDIR}/kiauh/kiauh.ini
BACKUP_DIR=${HOME}/kiauh-backups BACKUP_DIR=${HOME}/kiauh-backups
### set github repos ### set github repos
@@ -49,7 +53,6 @@ DMBUTYUGIN_REPO=https://github.com/dmbutyugin/klipper.git
DWC2FK_REPO=https://github.com/Stephan3/dwc2-for-klipper-socket.git DWC2FK_REPO=https://github.com/Stephan3/dwc2-for-klipper-socket.git
MOONRAKER_REPO=https://github.com/Arksine/moonraker.git MOONRAKER_REPO=https://github.com/Arksine/moonraker.git
#branches #branches
BRANCH_MOONRAKER=Arksine/dev-moonraker-testing
BRANCH_SCURVE_SMOOTHING=dmbutyugin/scurve-smoothing BRANCH_SCURVE_SMOOTHING=dmbutyugin/scurve-smoothing
BRANCH_SCURVE_SHAPING=dmbutyugin/scurve-shaping BRANCH_SCURVE_SHAPING=dmbutyugin/scurve-shaping
@@ -95,11 +98,6 @@ clear_msg(){
unset ERROR_MSG unset ERROR_MSG
} }
### sourcing all additional scripts
SRCDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
for script in "${SRCDIR}/kiauh/scripts/"*.sh; do . $script; done
for script in "${SRCDIR}/kiauh/scripts/ui/"*.sh; do . $script; done
check_euid check_euid
kiauh_status kiauh_status
main_menu main_menu

2
scripts/functions.sh
View File

@@ -28,7 +28,7 @@ locate_printer_cfg(){
} }
source_ini(){ source_ini(){
source ${HOME}/kiauh/kiauh.ini source ${SRCDIR}/kiauh/kiauh.ini
} }
start_klipper(){ start_klipper(){

9
scripts/switch_branch.sh
View File

@@ -20,13 +20,4 @@ switch_to_scurve_smoothing(){
git remote add dmbutyugin $DMBUTYUGIN_REPO git remote add dmbutyugin $DMBUTYUGIN_REPO
fi fi
git fetch dmbutyugin -q && git checkout $BRANCH_SCURVE_SMOOTHING -q git fetch dmbutyugin -q && git checkout $BRANCH_SCURVE_SMOOTHING -q
}
switch_to_moonraker(){
cd $KLIPPER_DIR
status_msg "Switching...Please wait ..."; echo
if ! git remote | grep Arksine -q; then
git remote add Arksine $ARKSINE_REPO
fi
git fetch Arksine -q && git checkout $BRANCH_MOONRAKER -q
} }