This commit is contained in:
th33xitus
2020-07-23 16:13:33 +02:00
parent 80344ec41c
commit 2596e8d08a
2 changed files with 3 additions and 5 deletions

View File

@@ -4,7 +4,7 @@ install_klipper(){
else else
#check for dependencies #check for dependencies
dep=(git) dep=(git)
dep_check dependency_check
#execute operation #execute operation
cd ${HOME} cd ${HOME}
status_msg "Cloning Klipper repository ..." status_msg "Cloning Klipper repository ..."

View File

@@ -1,10 +1,6 @@
mainsail_install_routine(){ mainsail_install_routine(){
ERROR="0" #reset error state ERROR="0" #reset error state
if [ -d $KLIPPER_DIR ]; then if [ -d $KLIPPER_DIR ]; then
#check for dependencies
dep=(wget curl unzip)
dependency_check
#execute operation
#disable octoprint service if installed #disable octoprint service if installed
if systemctl is-enabled octoprint.service -q 2>/dev/null; then if systemctl is-enabled octoprint.service -q 2>/dev/null; then
disable_octoprint_service disable_octoprint_service
@@ -31,6 +27,8 @@ mainsail_install_routine(){
install_moonraker(){ install_moonraker(){
cd $KLIPPER_DIR cd $KLIPPER_DIR
if [[ $(git describe --all) = "remotes/Arksine/work-web_server-20200131" || $(git describe --all) = "remotes/Arksine/dev-moonraker-testing" ]]; then if [[ $(git describe --all) = "remotes/Arksine/work-web_server-20200131" || $(git describe --all) = "remotes/Arksine/dev-moonraker-testing" ]]; then
dep=(wget curl unzip)
dependency_check
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