update script to use mainsail beta - dropping mainsail alpha

scripts/install_mainsail.sh

@@ -26,11 +26,15 @@ mainsail_install_routine(){
 
 install_moonraker(){
   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/dev-moonraker-testing" ]]; then
     dep=(wget curl unzip)
     dependency_check
+    status_msg "Downloading Moonraker ..."
+    cd ${HOME} && git clone $MOONRAKER_REPO
+    ok_msg "Download complete!"
     status_msg "Installing Moonraker ..."
-    $KLIPPER_DIR/scripts/install-moonraker.sh && ok_msg "Moonraker successfully installed!"
+    $MOONRAKER_DIR/scripts/install-moonraker.sh && ok_msg "Moonraker successfully installed!"
+    #create sdcard folder if it doesn't exists yet
     if [ ! -d ${HOME}/sdcard ]; then
       mkdir ${HOME}/sdcard
     fi
@@ -40,7 +44,7 @@ install_moonraker(){
       ln -s /tmp/moonraker.log ${HOME}/moonraker.log && ok_msg "Symlink created!"
     fi
   else
-    ERROR_MSG=" You are not using a Moonraker fork\n Please switch to a Moonraker fork first! Aborting ..."
+    ERROR_MSG=" You are not using the Moonraker fork\n Please switch to the Moonraker fork first! Aborting ..."
     ERROR=1
   fi
 }
@@ -86,20 +90,20 @@ VSDCARD
 }
 
 check_api_section(){
-  status_msg "Checking for api_server configuration ..."
+  status_msg "Checking for moonraker configuration ..."
   # check if api server is present in printer.cfg
-  if [ $(grep '^\[api_server\]$' $PRINTER_CFG) ]; then
-    ok_msg "API Server already configured"
+  if [ $(grep '^\[moonraker\]$' $PRINTER_CFG) ]; then
+    ok_msg "Moonraker already configured"
   else
-    status_msg "No API Server entry found."
-    ok_msg "API server entry added to printer.cfg!"
+    status_msg "No Moonraker entry found."
+    ok_msg "Moonraker entry added to printer.cfg!"
 # append the following lines to printer.cfg
 cat <<API >> $PRINTER_CFG
 
 ##########################
 ### CREATED WITH KIAUH ###
 ##########################
-[api_server]
+[moonraker]
 trusted_clients:
  192.168.0.0/24
  192.168.1.0/24
@@ -119,7 +123,7 @@ cat <<DEFAULT_CFG >> $PRINTER_CFG
 [virtual_sdcard]
 path: ~/sdcard
 
-[api_server]
+[moonraker]
 trusted_clients:
  192.168.0.0/24
  192.168.1.0/24
@@ -223,12 +227,12 @@ test_nginx(){
 }
 
 get_mainsail_ver(){
-  MAINSAIL_VERSION=`curl -s https://api.github.com/repositories/240875926/tags | grep name | cut -d'"' -f4 | cut -d"v" -f2 | head -1`
+  MAINSAIL_VERSION=$(curl -s https://api.github.com/repositories/240875926/tags | grep name | cut -d'"' -f4 | cut -d"v" -f2 | head -1)
 }
 
 mainsail_dl_url(){
   get_mainsail_ver
-  MAINSAIL_URL=https://github.com/meteyou/mainsail/releases/download/v"$MAINSAIL_VERSION"/mainsail-alpha-"$MAINSAIL_VERSION".zip
+  MAINSAIL_URL=https://github.com/meteyou/mainsail/releases/download/v"$MAINSAIL_VERSION"/mainsail-beta-"$MAINSAIL_VERSION".zip
 }
 
 install_mainsail(){

scripts/remove.sh

@@ -69,10 +69,11 @@ remove_mainsail(){
   $MOONRAKER_SERVICE1
   $MOONRAKER_SERVICE2
   $MAINSAIL_DIR
+  $MOONRAKER_DIR
+  $MOONRAKER_ENV_DIR
   ${HOME}/moonraker.log
   ${HOME}/.klippy_api_key
   ${HOME}/.moonraker_api_key
-  ${HOME}/moonraker-env
   /etc/nginx/sites-available/mainsail
   /etc/nginx/sites-enabled/mainsail
   )
@@ -90,15 +91,15 @@ remove_mainsail(){
       status_msg "Removing Mainsail directory ..."
       rm -rf $MAINSAIL_DIR && ok_msg "Directory removed!"
     fi
-    #remove moonraker-env
-    if [ -d ${HOME}/moonraker-env ]; then
-      status_msg "Removing Moonraker virtualenv ..."
-      rm -rf ${HOME}/moonraker-env && ok_msg "Directory removed!"
+    #remove moonraker and moonraker-env dir
+    if [[ -d $MOONRAKER_DIR || -d $MOONRAKER_ENV_DIR ]]; then
+      status_msg "Removing Moonraker and moonraker-env directory ..."
+      rm -rf $MOONRAKER_DIR $MOONRAKER_ENV_DIR && ok_msg "Directories removed!"
     fi
-    #remove moonraker.log symlink
+    #remove moonraker.log and symlink
     if [[ -L ${HOME}/moonraker.log || -e /tmp/moonraker.log ]]; then
-      status_msg "Removing moonraker.log Symlink ..."
-      rm -rf ${HOME}/moonraker.log /tmp/moonraker.log && ok_msg "Symlink removed!"
+      status_msg "Removing moonraker.log and Symlink ..."
+      rm -rf ${HOME}/moonraker.log /tmp/moonraker.log && ok_msg "Files removed!"
     fi
     #remove mainsail cfg
     if [ -e /etc/nginx/sites-available/mainsail ]; then

scripts/status.sh

@@ -133,10 +133,8 @@ print_branch(){
     PRINT_BRANCH="scurve-shaping     "
   elif [ "$GET_BRANCH" == "dmbutyugin/scurve-smoothing" ]; then
     PRINT_BRANCH="scurve-smoothing   "
-  elif [ "$GET_BRANCH" == "Arksine/work-web_server-20200131" ]; then
-    PRINT_BRANCH="moonraker          "
   elif [ "$GET_BRANCH" == "Arksine/dev-moonraker-testing" ]; then
-    PRINT_BRANCH="dev-moonraker      "
+    PRINT_BRANCH="moonraker          "
   else
     PRINT_BRANCH="${red}----${default}               "
   fi

scripts/switch_branch.sh

@@ -29,13 +29,4 @@ switch_to_moonraker(){
     git remote add Arksine $ARKSINE_REPO
   fi
   git fetch Arksine -q && git checkout $BRANCH_MOONRAKER -q
-}
-
-switch_to_dev_moonraker(){
-  cd $KLIPPER_DIR
-  status_msg "Switching...Please wait ..."; echo
-  if ! git remote | grep Arksine -q; then
-    git remote add Arksine $ARKSINE_REPO
-  fi
-  git fetch Arksine -q && git checkout $BRANCH_DEV_MOONRAKER -q
 }

scripts/ui.sh

@@ -153,7 +153,6 @@ switch_ui(){
   echo -e "|  3) [--> scurve-smoothing]                            | "
   echo -e "|                                                       | "
   echo -e "|  4) [--> moonraker]                                   | "
-  echo -e "|  5) [--> dev-moonraker]                               | "
   quit_footer
 }