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

fix: few moonraker update changes

Browse Source 
- change in the description
- option 1 only does a git pull again when rebuilding venv/deps is not necessary
This commit is contained in:
th33xitus
2020-12-02 21:39:16 +01:00
committed by GitHub
parent d3b7c923bd
commit f1289504bf
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/update.sh
View File

@@ -126,27 +126,25 @@ update_moonraker(){
top_border top_border
echo -e "| You can now choose how you want to update Moonraker. |" echo -e "| You can now choose how you want to update Moonraker. |"
blank_line blank_line
echo -e "| It is possible, that changes made to the Moonraker |" echo -e "| Changes made to the Moonraker code and/or its depen- |"
echo -e "| code and/or its dependencies might require a rebuild |" echo -e "| dencies might require a rebuild of the python virtual |"
echo -e "| of the python virtual envrionment. |" echo -e "| environment or downloading of additional packages. |"
blank_line blank_line
echo -e "| ${yellow}Please check the docs in the Moonraker repository to${default} |" echo -e "| ${red}Check the docs in the Moonraker repository to see if${default} |"
echo -e "| ${yellow}see if a rebuild is necessary (user_changes.md).${default} |" echo -e "| ${red}rebuilding is necessary (user_changes.md)!${default} |"
blank_line blank_line
echo -e "| 1) Update Moonraker (default) |" echo -e "| 1) Update Moonraker (default) |"
echo -e "| 2) Update Moonraker + rebuild virtualenv |" echo -e "| 2) Update Moonraker + rebuild virtualenv/dependencies |"
quit_footer quit_footer
read -p "${cyan}###### Please choose:${default} " action read -p "${cyan}###### Please choose:${default} " action
case "$action" in case "$action" in
1|"") 1|"")
echo -e "###### > Update Moonraker" echo -e "###### > Update Moonraker"
update_mr="true" update_mr="true" && rebuild_env="false"
rebuild_env="false"
break;; break;;
2) 2)
echo -e "###### > Update Moonraker + rebuild virtualenv" echo -e "###### > Update Moonraker + rebuild virtualenv/dependencies"
update_mr="true" update_mr="true" && rebuild_env="true"
rebuild_env="true"
break;; break;;
Q|q) Q|q)
clear; update_menu; break;; clear; update_menu; break;;
@@ -158,7 +156,7 @@ update_moonraker(){
stop_moonraker; echo stop_moonraker; echo
if [[ $update_mr = "true" ]] && [[ $rebuild_env = "false" ]]; then if [[ $update_mr = "true" ]] && [[ $rebuild_env = "false" ]]; then
unset update_mr && unset rebuild_env unset update_mr && unset rebuild_env
cd $MOONRAKER_DIR && git pull && ./scripts/install-moonraker.sh cd $MOONRAKER_DIR && git pull
fi fi
if [[ $update_mr = "true" ]] && [[ $rebuild_env = "true" ]]; then if [[ $update_mr = "true" ]] && [[ $rebuild_env = "true" ]]; then
unset update_mr && unset rebuild_env unset update_mr && unset rebuild_env
@@ -167,7 +165,7 @@ update_moonraker(){
#read printer.cfg location and patch /etc/default/klipper if entries don't match #read printer.cfg location and patch /etc/default/klipper if entries don't match
locate_printer_cfg && patch_klipper_sysfile locate_printer_cfg && patch_klipper_sysfile
ok_msg "Update complete!" ok_msg "Update complete!"
start_moonraker restart_moonraker
} }
update_klipperscreen(){ update_klipperscreen(){