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

fix: small clean-up

Browse Source
This commit is contained in:
th33xitus
2021-01-25 19:09:30 +01:00
parent 1527d7a25d
commit f10a604f97
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kiauh.sh
View File

@@ -46,7 +46,9 @@ BACKUP_DIR=${HOME}/kiauh-backups
KLIPPER_REPO=https://github.com/KevinOConnor/klipper.git KLIPPER_REPO=https://github.com/KevinOConnor/klipper.git
ARKSINE_REPO=https://github.com/Arksine/klipper.git ARKSINE_REPO=https://github.com/Arksine/klipper.git
DMBUTYUGIN_REPO=https://github.com/dmbutyugin/klipper.git DMBUTYUGIN_REPO=https://github.com/dmbutyugin/klipper.git
###TODO use my own dwc2-for-klipper-socket repo as long as the needed start argument PR is not merged yet
DWC2FK_REPO=https://github.com/th33xitus/dwc2-for-klipper-socket.git DWC2FK_REPO=https://github.com/th33xitus/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
KLIPPERSCREEN_REPO=https://github.com/jordanruthe/KlipperScreen.git KLIPPERSCREEN_REPO=https://github.com/jordanruthe/KlipperScreen.git
#branches #branches

16
scripts/install_dwc2.sh
View File

@@ -1,9 +1,9 @@
### base variables ### base variables
SYSTEMDDIR="/etc/systemd/system" SYSTEMDDIR="/etc/systemd/system"
DWC_ENV="${HOME}/dwc-env" DWC_ENV="${HOME}/dwc-env"
DWC2_DIR="${HOME}/sdcard/web" DWC2_DIR="${HOME}/duetwebcontrol"
system_check_dwc2(){ system_check_dwc(){
### check system for an installed octoprint service ### check system for an installed octoprint service
if systemctl is-enabled octoprint.service -q 2>/dev/null; then if systemctl is-enabled octoprint.service -q 2>/dev/null; then
OCTOPRINT_ENABLED="true" OCTOPRINT_ENABLED="true"
@@ -11,10 +11,10 @@ system_check_dwc2(){
} }
dwc_setup_dialog(){ dwc_setup_dialog(){
status_msg "Initializing DWC2 installation ..." status_msg "Initializing Duet Web Control installation ..."
### check system for several requirements before initializing the dwc2 installation ### check system for several requirements before initializing the dwc2 installation
system_check_dwc2 system_check_dwc
### check for existing klipper service installations ### check for existing klipper service installations
if [ ! "$(systemctl list-units --full -all -t service --no-legend | grep -F "klipper.service")" ] && [ ! "$(systemctl list-units --full -all -t service --no-legend | grep -E "klipper-[[:digit:]].service")" ]; then if [ ! "$(systemctl list-units --full -all -t service --no-legend | grep -F "klipper.service")" ] && [ ! "$(systemctl list-units --full -all -t service --no-legend | grep -E "klipper-[[:digit:]].service")" ]; then
@@ -150,7 +150,7 @@ download_dwc_webui(){
[ ! -d $DWC2_DIR ] && mkdir -p $DWC2_DIR [ ! -d $DWC2_DIR ] && mkdir -p $DWC2_DIR
cd $DWC2_DIR && wget $GET_DWC2_URL cd $DWC2_DIR && wget $GET_DWC2_URL
ok_msg "Download complete!" ok_msg "Download complete!"
status_msg "Unzipping archive ..." status_msg "Extracting archive ..."
unzip -q -o *.zip unzip -q -o *.zip
for f_ in $(find . | grep '.gz') for f_ in $(find . | grep '.gz')
do do
@@ -160,10 +160,8 @@ download_dwc_webui(){
status_msg "Writing DWC version to file ..." status_msg "Writing DWC version to file ..."
echo $GET_DWC2_URL | cut -d/ -f8 > $DWC2_DIR/.version echo $GET_DWC2_URL | cut -d/ -f8 > $DWC2_DIR/.version
ok_msg "Done!" ok_msg "Done!"
status_msg "Do a little cleanup ..." status_msg "Remove downloaded archive ..."
rm -rf DuetWebControl-SD.zip rm -rf *.zip && ok_msg "Done!" && ok_msg "Duet Web Control installed!"
ok_msg "Done!"
ok_msg "DWC2 Web UI installed!"
} }
############################################################################################## ##############################################################################################