From db5b906e5b1c2576da61319705df629a0175f8dc Mon Sep 17 00:00:00 2001 From: th33xitus <> Date: Thu, 20 Aug 2020 18:30:56 +0200 Subject: [PATCH] add: separate install/remove function for mainsail and moonraker --- kiauh.sh | 22 ++++++++++++---- scripts/install_mainsail.sh | 33 ++++++++++++------------ scripts/remove.sh | 51 ++++++++++++++++++++++--------------- scripts/ui.sh | 34 ++++++++++++------------- 4 files changed, 80 insertions(+), 60 deletions(-) diff --git a/kiauh.sh b/kiauh.sh index 129c37d..e6545aa 100755 --- a/kiauh.sh +++ b/kiauh.sh @@ -172,16 +172,22 @@ install_menu(){ 2) clear print_header - dwc2_install_routine + install_moonraker print_msg && clear_msg install_ui;; 3) clear print_header - install_moonraker + dwc2_install_routine print_msg && clear_msg install_ui;; 4) + clear + print_header + INST_MAINSAIL="true" && install_mainsail + print_msg && clear_msg + install_ui;; + 5) clear print_header octoprint_install_routine @@ -279,22 +285,28 @@ remove_menu(){ 2) clear print_header - remove_dwc2 + remove_moonraker print_msg && clear_msg remove_ui;; 3) clear print_header - remove_mainsail + remove_dwc2 print_msg && clear_msg remove_ui;; 4) clear print_header - remove_octoprint + remove_mainsail print_msg && clear_msg remove_ui;; 5) + clear + print_header + remove_octoprint + print_msg && clear_msg + remove_ui;; + 6) clear print_header remove_nginx diff --git a/scripts/install_mainsail.sh b/scripts/install_mainsail.sh index eaff8c6..1c9a832 100755 --- a/scripts/install_mainsail.sh +++ b/scripts/install_mainsail.sh @@ -1,19 +1,21 @@ install_mainsail(){ - if [ -d $KLIPPER_DIR ] && [ "$INST_MAINSAIL" = "true" ]; then - #disable octoprint service if installed - if systemctl is-enabled octoprint.service -q 2>/dev/null; then - disable_octoprint_service - fi - disable_haproxy_lighttpd - #remove_haproxy_lighttpd - #beginning of mainsail installation - create_reverse_proxy "mainsail" - test_api - test_nginx - mainsail_setup - ok_msg "Mainsail installation complete!"; echo - else - ERROR_MSG=" Please install Klipper first!\n Skipping..." + if [ "$INST_MAINSAIL" = "true" ]; then + if [ -d $KLIPPER_DIR ]; then + #disable octoprint service if installed + if systemctl is-enabled octoprint.service -q 2>/dev/null; then + disable_octoprint_service + fi + disable_haproxy_lighttpd + #remove_haproxy_lighttpd + #beginning of mainsail installation + create_reverse_proxy "mainsail" + test_api + test_nginx + mainsail_setup + ok_msg "Mainsail installation complete!"; echo + else + ERROR_MSG=" Please install Klipper first!\n Skipping..." + fi fi } @@ -64,7 +66,6 @@ test_api(){ } test_nginx(){ - sudo /etc/init.d/nginx restart status_msg "Testing Nginx ..." sleep 5 status_msg "API response from http://localhost/printer/info:" diff --git a/scripts/remove.sh b/scripts/remove.sh index 44f6722..50392b9 100755 --- a/scripts/remove.sh +++ b/scripts/remove.sh @@ -58,11 +58,10 @@ remove_dwc2(){ fi } -remove_mainsail(){ +remove_moonraker(){ data_arr=( $MOONRAKER_SERVICE1 $MOONRAKER_SERVICE2 - $MAINSAIL_DIR $MOONRAKER_DIR $MOONRAKER_ENV_DIR ${HOME}/moonraker.conf @@ -70,10 +69,8 @@ remove_mainsail(){ ${HOME}/klipper_config/moonraker.log ${HOME}/.klippy_api_key ${HOME}/.moonraker_api_key - /etc/nginx/sites-available/mainsail - /etc/nginx/sites-enabled/mainsail ) - print_error "Mainsail" && data_count=() + print_error "Moonraker" && data_count=() if [ "$ERROR_MSG" = "" ]; then stop_moonraker #remove moonraker services @@ -82,11 +79,6 @@ remove_mainsail(){ sudo update-rc.d -f moonraker remove sudo rm -rf /etc/init.d/moonraker /etc/default/moonraker && ok_msg "Moonraker Service removed!" fi - #remove mainsail dir - if [ -d $MAINSAIL_DIR ]; then - status_msg "Removing Mainsail directory ..." - rm -rf $MAINSAIL_DIR && ok_msg "Directory removed!" - fi #remove moonraker and moonraker-env dir if [[ -d $MOONRAKER_DIR || -d $MOONRAKER_ENV_DIR ]]; then status_msg "Removing Moonraker and moonraker-env directory ..." @@ -110,16 +102,6 @@ remove_mainsail(){ rm -rf ${HOME}/moonraker.log ${HOME}/klipper_config/moonraker.log /tmp/moonraker.log ok_msg "Files removed!" fi - #remove mainsail cfg - if [ -e /etc/nginx/sites-available/mainsail ]; then - status_msg "Removing Mainsail configuration for Nginx ..." - sudo rm /etc/nginx/sites-available/mainsail && ok_msg "File removed!" - fi - #remove mainsail symlink - if [ -L /etc/nginx/sites-enabled/mainsail ]; then - status_msg "Removing Mainsail Symlink for Nginx ..." - sudo rm /etc/nginx/sites-enabled/mainsail && ok_msg "File removed!" - fi #remove legacy api key if [ -e ${HOME}/.klippy_api_key ]; then status_msg "Removing legacy API Key ..." @@ -130,7 +112,34 @@ remove_mainsail(){ status_msg "Removing API Key ..." rm ${HOME}/.moonraker_api_key && ok_msg "Done!" fi - CONFIRM_MSG=" Mainsail successfully removed!" + CONFIRM_MSG="Moonraker successfully removed!" + fi +} + +remove_mainsail(){ + data_arr=( + $MAINSAIL_DIR + /etc/nginx/sites-available/mainsail + /etc/nginx/sites-enabled/mainsail + ) + print_error "Mainsail" && data_count=() + if [ "$ERROR_MSG" = "" ]; then + #remove mainsail dir + if [ -d $MAINSAIL_DIR ]; then + status_msg "Removing Mainsail directory ..." + rm -rf $MAINSAIL_DIR && ok_msg "Directory removed!" + fi + #remove mainsail config for nginx + if [ -e /etc/nginx/sites-available/mainsail ]; then + status_msg "Removing Mainsail configuration for Nginx ..." + sudo rm /etc/nginx/sites-available/mainsail && ok_msg "File removed!" + fi + #remove mainsail symlink for nginx + if [ -L /etc/nginx/sites-enabled/mainsail ]; then + status_msg "Removing Mainsail Symlink for Nginx ..." + sudo rm /etc/nginx/sites-enabled/mainsail && ok_msg "File removed!" + fi + CONFIRM_MSG="Mainsail successfully removed!" fi } diff --git a/scripts/ui.sh b/scripts/ui.sh index f331ce8..ab63ec6 100755 --- a/scripts/ui.sh +++ b/scripts/ui.sh @@ -45,25 +45,23 @@ main_ui(){ install_ui(){ top_border - echo -e "| $(title_msg "~~~~~~~~~~~ [ Installation Menu ] ~~~~~~~~~~~") | " + echo -e "| ${green}~~~~~~~~~~~ [ Installation Menu ] ~~~~~~~~~~~${default} | " hr echo -e "| You need this menu usually only for installing | " echo -e "| all necessary dependencies for the various | " echo -e "| functions on a completely fresh system. | " hr - echo -e "| Firmware: | | " - echo -e "| 1) [Klipper] | | " - echo -e "| | | " - echo -e "| Webinterface: | | " - echo -e "| 2) [DWC2] | | " - echo -e "| 3) [Mainsail] | | " - echo -e "| 4) [Octoprint] | | " + echo -e "| Firmware: | Webinterface: | " + echo -e "| 1) [Klipper] | 3) [DWC2] | " + echo -e "| | 4) [Mainsail] | " + echo -e "| Klipper API: | 5) [Octoprint] | " + echo -e "| 2) [Moonraker] | | " quit_footer } update_ui(){ top_border - echo -e "| $(title_msg "~~~~~~~~~~~~~~ [ Update Menu ] ~~~~~~~~~~~~~~") | " + echo -e "| ${green}~~~~~~~~~~~~~~ [ Update Menu ] ~~~~~~~~~~~~~~${default} | " hr echo -e "| It is a good idea to check the following website | " echo -e "| for important software changes to the config file | " @@ -89,26 +87,26 @@ update_ui(){ remove_ui(){ top_border - echo -e "| $(title_msg "~~~~~~~~~~~~~~ [ Remove Menu ] ~~~~~~~~~~~~~~") | " + echo -e "| ${red}~~~~~~~~~~~~~~ [ Remove Menu ] ~~~~~~~~~~~~~~${default} | " hr echo -e "| Files and directories which remain untouched: | " echo -e "| --> ~/printer.cfg | " echo -e "| --> ~/kiauh-backups | " echo -e "| You need remove them manually if you wish so. | " hr - echo -e "| Firmware: | | " - echo -e "| 1) [Klipper] | 5) [Nginx] | " - echo -e "| | | " - echo -e "| Webinterface: | | " - echo -e "| 2) [DWC2] | | " - echo -e "| 3) [Mainsail] | | " - echo -e "| 4) [Octoprint] | | " + echo -e "| Firmware: | Webinterface: | " + echo -e "| 1) [Klipper] | 3) [DWC2] | " + echo -e "| | 4) [Mainsail] | " + echo -e "| Klipper API: | 5) [Octoprint] | " + echo -e "| 2) [Moonraker] | | " + echo -e "| | Webserver: | " + echo -e "| | 6) [Nginx] | " quit_footer } advanced_ui(){ top_border - echo -e "| $(title_msg "~~~~~~~~~~~~~ [ Advanced Menu ] ~~~~~~~~~~~~~") | " + echo -e "| ${yellow}~~~~~~~~~~~~~ [ Advanced Menu ] ~~~~~~~~~~~~~${default} | " hr echo -e "| 0) $OPRINT_SERVICE_STATUS| " hr