jeka/kiauh
1
0
Fork 0
mirror of https://github.com/dw-0/kiauh.git synced 2025-12-13 10:34:28 +05:00
Code Issues Packages Projects Releases Wiki Activity

add: separate install/remove function for mainsail and moonraker

Browse Source
This commit is contained in:
th33xitus
2020-08-20 18:30:56 +02:00
parent d78670e0ab
commit db5b906e5b
4 changed files with 80 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
kiauh.sh
View File

@@ -172,16 +172,22 @@ install_menu(){
2) 2)
clear clear
print_header print_header
dwc2_install_routine install_moonraker
print_msg && clear_msg print_msg && clear_msg
install_ui;; install_ui;;
3) 3)
clear clear
print_header print_header
install_moonraker dwc2_install_routine
print_msg && clear_msg print_msg && clear_msg
install_ui;; install_ui;;
4) 4)
clear
print_header
INST_MAINSAIL="true" && install_mainsail
print_msg && clear_msg
install_ui;;
5)
clear clear
print_header print_header
octoprint_install_routine octoprint_install_routine
@@ -279,22 +285,28 @@ remove_menu(){
2) 2)
clear clear
print_header print_header
remove_dwc2 remove_moonraker
print_msg && clear_msg print_msg && clear_msg
remove_ui;; remove_ui;;
3) 3)
clear clear
print_header print_header
remove_mainsail remove_dwc2
print_msg && clear_msg print_msg && clear_msg
remove_ui;; remove_ui;;
4) 4)
clear clear
print_header print_header
remove_octoprint remove_mainsail
print_msg && clear_msg print_msg && clear_msg
remove_ui;; remove_ui;;
5) 5)
clear
print_header
remove_octoprint
print_msg && clear_msg
remove_ui;;
6)
clear clear
print_header print_header
remove_nginx remove_nginx

33
scripts/install_mainsail.sh
View File

@@ -1,19 +1,21 @@
install_mainsail(){ install_mainsail(){
if [ -d $KLIPPER_DIR ] && [ "$INST_MAINSAIL" = "true" ]; then if [ "$INST_MAINSAIL" = "true" ]; then
#disable octoprint service if installed if [ -d $KLIPPER_DIR ]; then
if systemctl is-enabled octoprint.service -q 2>/dev/null; then #disable octoprint service if installed
disable_octoprint_service if systemctl is-enabled octoprint.service -q 2>/dev/null; then
fi disable_octoprint_service
disable_haproxy_lighttpd fi
#remove_haproxy_lighttpd disable_haproxy_lighttpd
#beginning of mainsail installation #remove_haproxy_lighttpd
create_reverse_proxy "mainsail" #beginning of mainsail installation
test_api create_reverse_proxy "mainsail"
test_nginx test_api
mainsail_setup test_nginx
ok_msg "Mainsail installation complete!"; echo mainsail_setup
else ok_msg "Mainsail installation complete!"; echo
ERROR_MSG=" Please install Klipper first!\n Skipping..." else
ERROR_MSG=" Please install Klipper first!\n Skipping..."
fi
fi fi
} }
@@ -64,7 +66,6 @@ test_api(){
} }
test_nginx(){ test_nginx(){
sudo /etc/init.d/nginx restart
status_msg "Testing Nginx ..." status_msg "Testing Nginx ..."
sleep 5 sleep 5
status_msg "API response from http://localhost/printer/info:" status_msg "API response from http://localhost/printer/info:"

51
scripts/remove.sh
View File

@@ -58,11 +58,10 @@ remove_dwc2(){
fi fi
} }
remove_mainsail(){ remove_moonraker(){
data_arr=( data_arr=(
$MOONRAKER_SERVICE1 $MOONRAKER_SERVICE1
$MOONRAKER_SERVICE2 $MOONRAKER_SERVICE2
$MAINSAIL_DIR
$MOONRAKER_DIR $MOONRAKER_DIR
$MOONRAKER_ENV_DIR $MOONRAKER_ENV_DIR
${HOME}/moonraker.conf ${HOME}/moonraker.conf
@@ -70,10 +69,8 @@ remove_mainsail(){
${HOME}/klipper_config/moonraker.log ${HOME}/klipper_config/moonraker.log
${HOME}/.klippy_api_key ${HOME}/.klippy_api_key
${HOME}/.moonraker_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 if [ "$ERROR_MSG" = "" ]; then
stop_moonraker stop_moonraker
#remove moonraker services #remove moonraker services
@@ -82,11 +79,6 @@ remove_mainsail(){
sudo update-rc.d -f moonraker remove sudo update-rc.d -f moonraker remove
sudo rm -rf /etc/init.d/moonraker /etc/default/moonraker && ok_msg "Moonraker Service removed!" sudo rm -rf /etc/init.d/moonraker /etc/default/moonraker && ok_msg "Moonraker Service removed!"
fi 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 #remove moonraker and moonraker-env dir
if [[ -d $MOONRAKER_DIR || -d $MOONRAKER_ENV_DIR ]]; then if [[ -d $MOONRAKER_DIR || -d $MOONRAKER_ENV_DIR ]]; then
status_msg "Removing Moonraker and moonraker-env directory ..." 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 rm -rf ${HOME}/moonraker.log ${HOME}/klipper_config/moonraker.log /tmp/moonraker.log
ok_msg "Files removed!" ok_msg "Files removed!"
fi 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 #remove legacy api key
if [ -e ${HOME}/.klippy_api_key ]; then if [ -e ${HOME}/.klippy_api_key ]; then
status_msg "Removing legacy API Key ..." status_msg "Removing legacy API Key ..."
@@ -130,7 +112,34 @@ remove_mainsail(){
status_msg "Removing API Key ..." status_msg "Removing API Key ..."
rm ${HOME}/.moonraker_api_key && ok_msg "Done!" rm ${HOME}/.moonraker_api_key && ok_msg "Done!"
fi 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 fi
} }

34
scripts/ui.sh
View File

@@ -45,25 +45,23 @@ main_ui(){
install_ui(){ install_ui(){
top_border top_border
echo -e "| $(title_msg "~~~~~~~~~~~ [ Installation Menu ] ~~~~~~~~~~~") | " echo -e "| ${green}~~~~~~~~~~~ [ Installation Menu ] ~~~~~~~~~~~${default} | "
hr hr
echo -e "| You need this menu usually only for installing | " echo -e "| You need this menu usually only for installing | "
echo -e "| all necessary dependencies for the various | " echo -e "| all necessary dependencies for the various | "
echo -e "| functions on a completely fresh system. | " echo -e "| functions on a completely fresh system. | "
hr hr
echo -e "| Firmware: | | " echo -e "| Firmware: | Webinterface: | "
echo -e "| 1) [Klipper] | | " echo -e "| 1) [Klipper] | 3) [DWC2] | "
echo -e "| | | " echo -e "| | 4) [Mainsail] | "
echo -e "| Webinterface: | | " echo -e "| Klipper API: | 5) [Octoprint] | "
echo -e "| 2) [DWC2] | | " echo -e "| 2) [Moonraker] | | "
echo -e "| 3) [Mainsail] | | "
echo -e "| 4) [Octoprint] | | "
quit_footer quit_footer
} }
update_ui(){ update_ui(){
top_border top_border
echo -e "| $(title_msg "~~~~~~~~~~~~~~ [ Update Menu ] ~~~~~~~~~~~~~~") | " echo -e "| ${green}~~~~~~~~~~~~~~ [ Update Menu ] ~~~~~~~~~~~~~~${default} | "
hr hr
echo -e "| It is a good idea to check the following website | " echo -e "| It is a good idea to check the following website | "
echo -e "| for important software changes to the config file | " echo -e "| for important software changes to the config file | "
@@ -89,26 +87,26 @@ update_ui(){
remove_ui(){ remove_ui(){
top_border top_border
echo -e "| $(title_msg "~~~~~~~~~~~~~~ [ Remove Menu ] ~~~~~~~~~~~~~~") | " echo -e "| ${red}~~~~~~~~~~~~~~ [ Remove Menu ] ~~~~~~~~~~~~~~${default} | "
hr hr
echo -e "| Files and directories which remain untouched: | " echo -e "| Files and directories which remain untouched: | "
echo -e "| --> ~/printer.cfg | " echo -e "| --> ~/printer.cfg | "
echo -e "| --> ~/kiauh-backups | " echo -e "| --> ~/kiauh-backups | "
echo -e "| You need remove them manually if you wish so. | " echo -e "| You need remove them manually if you wish so. | "
hr hr
echo -e "| Firmware: | | " echo -e "| Firmware: | Webinterface: | "
echo -e "| 1) [Klipper] | 5) [Nginx] | " echo -e "| 1) [Klipper] | 3) [DWC2] | "
echo -e "| | | " echo -e "| | 4) [Mainsail] | "
echo -e "| Webinterface: | | " echo -e "| Klipper API: | 5) [Octoprint] | "
echo -e "| 2) [DWC2] | | " echo -e "| 2) [Moonraker] | | "
echo -e "| 3) [Mainsail] | | " echo -e "| | Webserver: | "
echo -e "| 4) [Octoprint] | | " echo -e "| | 6) [Nginx] | "
quit_footer quit_footer
} }
advanced_ui(){ advanced_ui(){
top_border top_border
echo -e "| $(title_msg "~~~~~~~~~~~~~ [ Advanced Menu ] ~~~~~~~~~~~~~") | " echo -e "| ${yellow}~~~~~~~~~~~~~ [ Advanced Menu ] ~~~~~~~~~~~~~${default} | "
hr hr
echo -e "| 0) $OPRINT_SERVICE_STATUS| " echo -e "| 0) $OPRINT_SERVICE_STATUS| "
hr hr