mirror of
https://github.com/dw-0/kiauh.git
synced 2025-12-14 11:04:29 +05:00
Add abort method if not on moonraker fork
This commit is contained in:
@@ -4,16 +4,18 @@ mainsail_install_routine(){
|
|||||||
dep=(wget curl unzip)
|
dep=(wget curl unzip)
|
||||||
dep_check
|
dep_check
|
||||||
#execute operation
|
#execute operation
|
||||||
install_moonraker
|
|
||||||
disable_wrong_webserver
|
disable_wrong_webserver
|
||||||
remove_wrong_webserver
|
remove_wrong_webserver
|
||||||
check_printer_cfg
|
install_moonraker
|
||||||
restart_moonraker
|
if [ $ERROR != 1 ]; then
|
||||||
restart_klipper
|
check_printer_cfg
|
||||||
install_nginx
|
restart_moonraker
|
||||||
test_api
|
restart_klipper
|
||||||
test_nginx
|
install_nginx
|
||||||
install_mainsail && ok_msg "Mainsail install complete!"; echo
|
test_api
|
||||||
|
test_nginx
|
||||||
|
install_mainsail && ok_msg "Mainsail install complete!"; echo
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
ERROR_MSG=" Please install Klipper first!\n Skipping..."
|
ERROR_MSG=" Please install Klipper first!\n Skipping..."
|
||||||
fi
|
fi
|
||||||
@@ -21,7 +23,7 @@ mainsail_install_routine(){
|
|||||||
|
|
||||||
install_moonraker(){
|
install_moonraker(){
|
||||||
cd $KLIPPER_DIR
|
cd $KLIPPER_DIR
|
||||||
if [[ $(git describe --all) = "remotes/Arksine/work-web_server-20200131" ]]; then
|
if [[ $(git describe --all) = "remotes/Arksine/work-web_server-20200131" || $(git describe --all) = "remotes/Arksine/dev-moonraker-testing" ]]; then
|
||||||
status_msg "Installing Moonraker ..."
|
status_msg "Installing Moonraker ..."
|
||||||
$KLIPPER_DIR/scripts/install-moonraker.sh && ok_msg "Moonraker successfully installed!"
|
$KLIPPER_DIR/scripts/install-moonraker.sh && ok_msg "Moonraker successfully installed!"
|
||||||
if [ ! -d ${HOME}/sdcard ]; then
|
if [ ! -d ${HOME}/sdcard ]; then
|
||||||
@@ -35,15 +37,7 @@ install_moonraker(){
|
|||||||
else
|
else
|
||||||
warn_msg "You are not using Arksine/work-web_server-20200131."
|
warn_msg "You are not using Arksine/work-web_server-20200131."
|
||||||
warn_msg "Please switch to the moonraker fork first!"
|
warn_msg "Please switch to the moonraker fork first!"
|
||||||
while true; do
|
ERROR=1
|
||||||
echo -e "${cyan}"
|
|
||||||
read -p "###### Do you want to switch to it now? (Y/n): " yn
|
|
||||||
echo -e "${default}"
|
|
||||||
case "$yn" in
|
|
||||||
Y|y|Yes|yes|"") switch_to_moonraker && install_moonraker; break;;
|
|
||||||
N|n|No|no) break;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user