From fc4fe130cd3408a7a437aa1cb9976636a91c18a5 Mon Sep 17 00:00:00 2001 From: th33xitus Date: Mon, 27 Sep 2021 22:52:52 +0200 Subject: [PATCH] script: read webui ports from nginx config, write them to kiauh.ini --- scripts/functions.sh | 1 + scripts/install_klipper_webui.sh | 18 ++++++++++++++++++ scripts/remove.sh | 12 ++++++++++++ 3 files changed, 31 insertions(+) diff --git a/scripts/functions.sh b/scripts/functions.sh index 56bf80a..d4fa030 100755 --- a/scripts/functions.sh +++ b/scripts/functions.sh @@ -457,4 +457,5 @@ init_ini(){ if [ ! $(grep -E "^klipper_cfg_loc=" $INI_FILE) ]; then echo -e "\nklipper_cfg_loc=\c" >> $INI_FILE fi + fetch_webui_ports } diff --git a/scripts/install_klipper_webui.sh b/scripts/install_klipper_webui.sh index ea1fa84..908a4e4 100755 --- a/scripts/install_klipper_webui.sh +++ b/scripts/install_klipper_webui.sh @@ -112,6 +112,8 @@ install_webui(){ ### install mjpg-streamer [ "$INSTALL_MJPG" = "true" ] && install_mjpg-streamer + fetch_webui_ports #WIP + ### confirm message CONFIRM_MSG="$IF_NAME1 has been set up!" print_msg && clear_msg @@ -327,4 +329,20 @@ fluidd_setup(){ ### delete downloaded zip status_msg "Remove downloaded archive ..." rm -rf *.zip && ok_msg "Done!" +} + +fetch_webui_ports(){ + ### read listen ports from possible installed interfaces + ### and write them to ~/.kiauh.ini + WEBIFS=(mainsail fluidd octoprint dwc2) + for interface in "${WEBIFS[@]}"; do + if [ -f "/etc/nginx/sites-enabled/${interface}" ]; then + if [ ! -n "$(grep -E "${interface}_port" $INI_FILE)" ]; then + port=$(grep -E "listen" /etc/nginx/sites-available/$interface | sed -e 's/^[[:space:]]*//' | sed -e 's/;$//' | cut -d" " -f2) + sed -i '$a'"${interface}_port=${port}" $INI_FILE + fi + else + sed -i "/^${interface}_port/d" $INI_FILE + fi + done } \ No newline at end of file diff --git a/scripts/remove.sh b/scripts/remove.sh index 222be34..29af7d0 100755 --- a/scripts/remove.sh +++ b/scripts/remove.sh @@ -240,6 +240,9 @@ remove_dwc2(){ rm -rf $DWC2_DIR && ok_msg "Directory removed!" fi + ### remove dwc2_port from ~/.kiauh.ini + sed -i "/^dwc2_port=/d" $INI_FILE + CONFIRM_MSG=" DWC2-for-Klipper-Socket was successfully removed!" } @@ -273,6 +276,9 @@ remove_mainsail(){ rm -f $log done + ### remove mainsail_port from ~/.kiauh.ini + sed -i "/^mainsail_port=/d" $INI_FILE + CONFIRM_MSG="Mainsail successfully removed!" } @@ -303,6 +309,9 @@ remove_fluidd(){ rm -f $log done + ### remove fluidd_port from ~/.kiauh.ini + sed -i "/^fluidd_port=/d" $INI_FILE + CONFIRM_MSG="Fluidd successfully removed!" } @@ -345,6 +354,9 @@ remove_octoprint(){ done fi + ### remove octoprint_port from ~/.kiauh.ini + sed -i "/^octoprint_port=/d" $INI_FILE + CONFIRM_MSG=" OctoPrint successfully removed!" }