From e22c6be4908597bbb2357e41f1a0d10e3a88cd33 Mon Sep 17 00:00:00 2001 From: th33xitus Date: Fri, 13 Nov 2020 20:49:10 +0100 Subject: [PATCH] fix: cleanup --- scripts/install_klipper.sh | 4 ++-- scripts/network_functions.sh | 14 -------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/scripts/install_klipper.sh b/scripts/install_klipper.sh index 4747ffb..2df5670 100755 --- a/scripts/install_klipper.sh +++ b/scripts/install_klipper.sh @@ -13,8 +13,6 @@ install_klipper(){ get_user_selections_klipper(){ status_msg "Initializing Klipper installation ..." #let user choose to install systemd or init.d service - unset INST_SYSTEMD - unset INST_INITD while true; do echo top_border @@ -31,10 +29,12 @@ get_user_selections_klipper(){ read -p "${cyan}###### Please choose:${default} " action case "$action" in 1|"") + echo -e "###### > 1) Init.d" INST_KLIPPER_INITD="true" INST_KLIPPER_SYSTEMD="false" break;; 2) + echo -e "###### > 2) Systemd" INST_KLIPPER_INITD="false" INST_KLIPPER_SYSTEMD="true" break;; diff --git a/scripts/network_functions.sh b/scripts/network_functions.sh index 926f468..9002638 100755 --- a/scripts/network_functions.sh +++ b/scripts/network_functions.sh @@ -39,20 +39,6 @@ read_listen_port(){ LISTEN_PORT=$(grep listen /etc/nginx/sites-enabled/$1 | head -1 | sed 's/^\s*//' | cut -d" " -f2 | cut -d";" -f1) } -#test_nginx(){ -# HOST_IP=$(hostname -I | cut -d" " -f1) -# status_msg "Testing NGINX ..." -# status_msg "Please wait ..." -# sleep 15 -# status_msg "API response from http://$HOST_IP:$1/printer/info :" -# echo -e "${cyan}$(curl -s "http://"$HOST_IP:$1"/printer/info")${default}" -# if [ $(curl -s "http://"$HOST_IP:$1"/printer/info" | grep '^{"result"' -c) -eq 1 ]; then -# echo; ok_msg "NGINX is working correctly!"; echo -# else -# echo; warn_msg "NGINX is not working correctly!"; echo -# fi -#} - detect_enabled_sites(){ #check if there is another UI config already installed #and reads the port they are listening on