diff --git a/resources/fluidd_nginx.cfg b/resources/fluidd_nginx.cfg index 7510ce8..8e6dd70 100644 --- a/resources/fluidd_nginx.cfg +++ b/resources/fluidd_nginx.cfg @@ -56,4 +56,4 @@ server { location /webcam/ { proxy_pass http://mjpgstreamer/; } -} \ No newline at end of file +} diff --git a/resources/mainsail_nginx.cfg b/resources/mainsail_nginx.cfg index 7393c11..8e0adef 100644 --- a/resources/mainsail_nginx.cfg +++ b/resources/mainsail_nginx.cfg @@ -56,4 +56,4 @@ server { location /webcam/ { proxy_pass http://mjpgstreamer/; } -} \ No newline at end of file +} diff --git a/resources/upstreams.conf b/resources/upstreams.conf index dfd1ea2..4ecd9c6 100644 --- a/resources/upstreams.conf +++ b/resources/upstreams.conf @@ -10,4 +10,4 @@ upstream mjpgstreamer { #edit your webcam port here ip_hash; server 127.0.0.1:8080; -} \ No newline at end of file +} diff --git a/scripts/install_dwc2.sh b/scripts/install_dwc2.sh index 963fe8f..fc72b53 100755 --- a/scripts/install_dwc2.sh +++ b/scripts/install_dwc2.sh @@ -1,7 +1,3 @@ -############################################################################################## -#********************************************************************************************# -############################################################################################## - ### base variables SYSTEMDDIR="/etc/systemd/system" DWC_ENV="${HOME}/dwc-env" diff --git a/scripts/install_klipper.sh b/scripts/install_klipper.sh index 752fb88..a964c0e 100755 --- a/scripts/install_klipper.sh +++ b/scripts/install_klipper.sh @@ -115,7 +115,7 @@ MULTI_STARTSCRIPT create_minimal_printer_cfg(){ /bin/sh -c "cat > $1" << MINIMAL_CFG [mcu] -serial: /dev/serial/by-id/ +serial: /dev/serial/by-id/ [pause_resume] [display_status] diff --git a/scripts/install_klipperscreen.sh b/scripts/install_klipperscreen.sh old mode 100644 new mode 100755 index 1f58d44..142c153 --- a/scripts/install_klipperscreen.sh +++ b/scripts/install_klipperscreen.sh @@ -30,7 +30,11 @@ python3_check(){ } system_check_klipperscreen(){ - [ ! -e $klipper_cfg_loc/KlipperScreen.log ] && KLIPPERSCREEN_SL_FOUND="false" + if [ ! -e ${HOME}/klipper_config/KlipperScreen.log ]; then + KLIPPERSCREEN_SL_FOUND="false" + else + KLIPPERSCREEN_SL_FOUND="true" + fi } get_user_selections_klipperscreen(){ diff --git a/scripts/install_moonraker.sh b/scripts/install_moonraker.sh index 7fcfdfb..ea7c491 100755 --- a/scripts/install_moonraker.sh +++ b/scripts/install_moonraker.sh @@ -1,7 +1,3 @@ -############################################################################################## -#********************************************************************************************# -############################################################################################## - ### base variables SYSTEMDDIR="/etc/systemd/system" MOONRAKER_ENV="${HOME}/moonraker-env" diff --git a/scripts/install_octoprint.sh b/scripts/install_octoprint.sh index 3a117bc..591246e 100755 --- a/scripts/install_octoprint.sh +++ b/scripts/install_octoprint.sh @@ -1,7 +1,3 @@ -############################################################################################## -#********************************************************************************************# -############################################################################################## - ### base variables SYSTEMDDIR="/etc/systemd/system" OCTOPRINT_ENV="${HOME}/OctoPrint" diff --git a/scripts/update.sh b/scripts/update.sh index bf9d59d..2b157d1 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -2,6 +2,8 @@ update_kiauh(){ if [ "$KIAUH_UPDATE_AVAIL" = "true" ]; then status_msg "Updating KIAUH ..." cd ${HOME}/kiauh + ### force reset kiauh before updating + git reset --hard git pull && ok_msg "Update complete! Please restart KIAUH." exit -1 fi