Update install_moonraker.sh (#64)

added libjpeg-dev and zlib1g-dev to moonraker dependencies, this makes kiauh work for armbian

.gitignore

@@ -0,0 +1 @@
+kiauh.ini

README.md

@@ -1,12 +1,140 @@
-# KIAUH
+# **KIAUH - Klipper Installation And Update Helper**
 
-## Klipper Installation And Update Helper
+![main_menu](resources/screenshots/main.png)
 
-This script was actually created for my personal use only but i then decided to make the script accessible for everyone.
-It is meant to help guiding you through a complete fresh install of Klipper and optionally the DWC2 web UI + DWC2-for-Klipper.
-There are also functions for updating your current installations or removing them from your system.
+---
 
-## First things first: When you decide to use this script, you use it at your own risk!
+## **📋 Please see the [Changelog](docs/changelog.md) for possible important information !**
 
-# THIS VERSION IS WORK IN PROGRESS!!! 
-# BUGS MAY BE STILL PRESENT!!!
+---
+
+## **📢 Disclaimer: Usage of this script happens at your own risk!**
+
+This script acts as a helping hand for you to get set up in a fast and comfortable way.\
+**This does not mean, it will relieve you of using your brain.exe! 🧠**\
+Feel free to give it a try. If you have suggestions or encounter any problems, please report them.
+
+---
+
+## **🛠️ Instructions:**
+
+For downloading this script it is best to have git already installed.\
+If you haven't, please run `sudo apt-get install git -y` to install git first.\
+You will need it anyways!
+
+After git is installed, use the following commands in the given order to download and execute the script:
+
+```shell
+cd ~
+git clone https://github.com/th33xitus/kiauh.git
+cd kiauh
+chmod +x kiauh.sh scripts/*
+./kiauh.sh
+```
+
+## Additional Instructions:
+
+If you need some more detailed instructions on how to install Klipper and Mainsail with KIAUH, check out this website:\
+[Installing Klipper and Mainsail](https://3dp.tumbleweedlabs.com/firmware/klipper-firmware/installing-klipper-and-mainsail-on-your-raspberry-pi)\
+Credits for these instructions go to [@tumbleweedlabs](https://github.com/tumbleweedlabs).\
+Feel free to check out his work.
+
+---
+
+## **🧰 Functions and Features:**
+
+### **Core Functions:**
+
+- **Installing** of the Klipper Firmware to your Raspberry Pi or other Linux Distribution which makes use of init.d.
+- **Installing** of several different web interfaces such as Duet Web Control, Mainsail, Fluidd or OctoPrint including their dependencies.
+- **Installing** of the Moonraker API
+- **Updating** of all the listed installations above excluding OctoPrint. For updating OctoPrint, please use the OctoPrint interface!
+- **Removing** of all the listed installations above.
+- **Backup** of all the listed installations above.
+
+### **Also possible:**
+
+- Build the Klipper Firmware
+- Flash the MCU
+- Read ID of the currently connected printer (only one at the time)
+- Write necessary entries to your printer.cfg, some of them customizable right in the CLI.
+- and more ...
+
+### **For a list of additional features please see: [Feature List](docs/features.md)**
+
+---
+
+## **📝 Notes:**
+
+- Tested **only** on Raspberry Pi OS Lite (Debian Buster)
+- During the use of this script you might be asked for your sudo password. There are several functions involved which need sudo privileges.
+
+---
+
+## **🛈 Sources & Further Information**
+
+For more information or instructions, please check out the appropriate repositories listed below:
+
+---
+
+### **⛵Klipper** by [KevinOConnor](https://github.com/KevinOConnor) :
+
+https://github.com/KevinOConnor/klipper
+
+---
+
+### **⛵Klipper S-Curve fork** by [dmbutyugin](https://github.com/dmbutyugin) :
+
+https://github.com/dmbutyugin/klipper/tree/scurve-smoothing \
+https://github.com/dmbutyugin/klipper/tree/scurve-shaping
+
+---
+
+### **🌙Moonraker** by [Arksine](https://github.com/Arksine) :
+
+https://github.com/Arksine/moonraker
+
+---
+
+### **💨Mainsail Webinterface** by [meteyou](https://github.com/meteyou) :
+
+https://github.com/meteyou/mainsail
+
+---
+
+### **🌊Fluidd Webinterface** by [cadriel](https://github.com/cadriel) :
+
+https://github.com/cadriel/fluidd
+
+---
+
+### **🕸️Duet Web Control** by [Duet3D](https://github.com/Duet3D) :
+
+https://github.com/Duet3D/DuetWebControl
+
+---
+
+### **🕸️DWC2-for-Klipper-Socket** by [Stephan3](https://github.com/Stephan3) :
+
+https://github.com/Stephan3/dwc2-for-klipper-socket
+
+---
+
+### **🖥️KlipperScreen** by [jordanruthe](https://github.com/jordanruthe) :
+
+https://github.com/jordanruthe/KlipperScreen
+
+---
+
+### **🐙OctoPrint Webinterface** by [OctoPrint](https://github.com/OctoPrint) :
+
+https://octoprint.org \
+https://github.com/OctoPrint/OctoPrint
+
+---
+
+## **❓ FAQ**
+
+**_Q: Can i use this script to install multiple instancec of Klipper on the same Pi? (Multisession?)_**
+
+**A:** No, and at the moment i don't plan to implement this function. For multisession installations take a look at this script manu7irl created: https://github.com/manu7irl/klipper-DWC2-installer . Keep in mind that klipper-DWC2-installer and KIAUH are **NOT** compatible with each other.

docs/changelog.md

@@ -0,0 +1,43 @@
+## Changelog
+
+This document covers possible important changes to KIAUH.
+
+### 2020-11-28
+
+* KIAUH now supports the installation, update and removal of [KlipperScreen](https://github.com/jordanruthe/KlipperScreen). This feature was was provided by [jordanruthe](https://github.com/jordanruthe)! Thank you!
+
+### 2020-11-18
+
+* Some changes to Fluidd caused a little rework on how KIAUH will install/update Fluidd from now on. Please see the [fluidd v1.0.0-rc0 release notes](https://github.com/cadriel/fluidd/releases/tag/v1.0.0-rc.0) for further information about what modifications to the moonraker.conf file exactly had to be done. In a nutshell, KIAUH will now always patch the required entries to the moonraker.conf if not already there.
+
+### 2020-10-30:
+
+* The user can now choose to install Klipper as a systemd service.
+
+* The Shell Command extension and `shell_command.py` got renamed to G-Code Shell Command extension and `gcode_shell_command.py`. In case the [pending PR](https://github.com/KevinOConnor/klipper/pull/2173) will be merged in the future, this was an early attempt to dodge possible incompatibilities. The [G-Code Shell Command docs](gcode_shell_command.md) has been updated accordingly.
+
+* The way how KIAUH interacts and writes to the users printer.cfg got changed. Usually KIAUH wrote everything directly into the printer.cfg. The way it will work from now on is, that a new file called `kiauh.cfg` will be created if there is something that needs to be written to the printer.cfg and everything gets written to `kiauh.cfg` instead. The only thing which then gets written to the users printer.cfg is `[include kiauh.cfg]`. This line will be located at the very top of the existing printer.cfg with a little comment as a note. The user can then decide to either keep the `kiauh.cfg` or take its content, places it into the printer.cfg directly and remove the `[include kiauh.cfg]`.
+
+* The `mainsail_macros.cfg` got renamed to `webui_macros.cfg`. Since Mainsail and Fluidd both use the same kind of pause, cancel and resume macros, a more generic name was chosen for the file containing the example macros one can choose to install when installing those webinterfaces.
+
+### 2020-10-10:
+
+* Support for changing the Klipper branch to the moonraker-dev branch from @Arksine has been dropped. Support for Moonraker has been merged into Klipper mainline a long time ago.
+
+* A new function is available from the main menu. You can now upload your log files to http://paste.c-net.org/ to share them for debugging purposes.
+
+### 2020-10-06:
+
+* Fluidd, a new Klipper interface got added to the list of available installers. At the same time some installation routines have changed or have seen some rework. Changes were made to the installation of NGINX configurations. A method was introduced to change the listen port of a webinterface configuration if there is already another webinterface listening on the default port (80).
+
+* At the moment, the Moonraker installer no longer asks you whether you want to install a web interface too. For now you therefore have to install them with their respective installers. Please report any bugs or issues you encounter.
+
+### 2020-09-17:
+
+* The dev-2.0 branch will be abandoned as of today. If you did a checkout to that branch in the past, you have to checkout back to master to receive updates.
+
+### 2020-09-12:
+
+* The old [dwc2-for-klipper](https://github.com/Stephan3/dwc2-for-klipper) won't be supported anymore!\
+The is a new, fully rewritten project available: [dwc2-for-klipper-socket](https://github.com/Stephan3/dwc2-for-klipper-socket).\
+The installer of this script also got rewritten to make use of that new project. You will not be able to install or remove the old [dwc2-for-klipper](https://github.com/Stephan3/dwc2-for-klipper) with KIAUH anymore if you updated KIAUH to the newest version.

docs/features.md

@@ -0,0 +1,33 @@
+# Feature List:
+
+- **Automatic dependency check:**\
+If packages are missing but needed for the asked task, the script will automatically install them
+- **Switch between different Klipper Forks:**\
+[origin/master](https://github.com/KevinOConnor/klipper/tree/master) or [scurve-shaping](https://github.com/dmbutyugin/klipper/tree/scurve-shaping) or [scurve-smoothing](https://github.com/dmbutyugin/klipper/tree/scurve-smoothing)\
+The update function of the script will always update the currently selected/active fork!
+- **Toggle auto-create backups before updating:**\
+When enabled, a backup of the installation you want to update is made prior updating
+- **Rollback:**\
+When updating Klipper, KIAUH saves the current commit hash to a local ini-file. In case of an unsuccesfull update you can use this function to quickly revert back to the commit with the hash you updated from.
+- **Preconfigure OctoPrint:**\
+When installing OctoPrint, a config is created which preconfigures your installation to be used with Klipper.\
+That means:
+  - adding the restart/shutdown commands for OctoPrint
+  - adding the serial port `/tmp/printer`
+  - set the behavior to "Cancel any ongoing prints but stay connected to the printer"
+- **Enable/Disable OctoPrint Service:**\
+Usefull when using DWC2/Mainsail/Fluidd and OctoPrint at the same time to prevent them interfering with each other
+- **Set up reverse proxy for DWC2, Mainsail, Fluidd and OctoPrint and changing the hostname:**
+  - The script can install and configure Nginx for the selected webinterface
+  - It also allows you to make your webinterface reachable over an URL like `<hostname>.local` via avahi
+    - Example: If you name the host "my-printer", type `my-printer.local` in your webbrowser to open the installed webinterface
+    - If there is more than one webinterface installed, you have to append the port to that adress
+
+- **Installing a G-Code Shell Command extension:**\
+For further information about that extension please see the  [G-Code Shell Command Extension Doc](gcode_shell_command.md)
+
+- **Uploading logfiles:**\
+You can directly upload logfiles like klippy.log, moonraker.log and dwc2.log from the KIAUH main menu for providing them for troubleshooting purposes.
+
+
+to be continued...

docs/gcode_shell_command.md

@@ -0,0 +1,46 @@
+# G-Code Shell Command Extension
+
+### Creator of this extension is [Arksine](https://github.com/Arksine).
+
+This is a brief explanation of how to use the shell command extension for Klipper, which you can install with KIAUH.
+
+After installing the extension you can execute linux commands or even scripts from within Klipper with custom commands defined in your printer.cfg.
+
+#### How to configure a shell command:
+
+```shell
+# Runs a linux command or script from within klipper.  Note that sudo commands
+# that require password authentication are disallowed. All executable scripts
+# should include a shebang.
+# [gcode_shell_command my_shell_cmd]
+#command:
+#  The linux shell command/script to be executed.  This parameter must be
+#  provided
+#timeout: 2.
+#  The timeout in seconds until the command is forcably terminated.  Default
+#  is 2 seconds.
+#verbose: True
+#  If enabled, the command's output will be forwarded to the terminal.  Its
+#  recommended to set this to false for commands that my run in quick
+#  succession.  Default is True.
+```
+
+Once you have set up a shell command with the given parameters from above in your printer.cfg you can run the command as follows:
+`RUN_SHELL_COMMAND CMD=name`
+
+Example:
+
+```
+[gcode_shell_command hello_world]
+command: echo hello world
+timeout: 2.
+verbose: True
+```
+
+Execute with:
+`RUN_SHELL_COMMAND CMD=hello_world`
+
+## Warning
+
+This extension may have a high potential for abuse if not used carefully! Also, depending on the command you execute, high system loads may occur and can cause system instabilities.
+Use this extension at your own risk and only if you know what you are doing!

kiauh.ini

@@ -1 +0,0 @@
-backup_before_update=false

kiauh.sh

@@ -2,13 +2,64 @@
 clear
 set -e
 
-### set some variables
-ERROR_MSG=""
-green="\e[92m"
-yellow="\e[93m"
-red="\e[91m"
-cyan="\e[96m"
-default="\e[39m"
+### set color variables
+green=$(echo -en "\e[92m")
+yellow=$(echo -en "\e[93m")
+red=$(echo -en "\e[91m")
+cyan=$(echo -en "\e[96m")
+default=$(echo -en "\e[39m")
+
+### sourcing all additional scripts
+SRCDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
+for script in "${SRCDIR}/kiauh/scripts/"*.sh; do . $script; done
+for script in "${SRCDIR}/kiauh/scripts/ui/"*.sh; do . $script; done
+
+### set important directories
+#klipper
+KLIPPER_DIR=${HOME}/klipper
+KLIPPY_ENV_DIR=${HOME}/klippy-env
+KLIPPER_SERVICE1=/etc/init.d/klipper
+KLIPPER_SERVICE2=/etc/default/klipper
+KLIPPER_SERVICE3=/etc/systemd/system/klipper.service
+#nginx
+NGINX_SA=/etc/nginx/sites-available
+NGINX_SE=/etc/nginx/sites-enabled
+NGINX_CONFD=/etc/nginx/conf.d
+#moonraker
+MOONRAKER_DIR=${HOME}/moonraker
+MOONRAKER_ENV_DIR=${HOME}/moonraker-env
+MOONRAKER_SERVICE1=/etc/init.d/moonraker
+MOONRAKER_SERVICE2=/etc/default/moonraker
+#mainsail
+MAINSAIL_DIR=${HOME}/mainsail
+#fluidd
+FLUIDD_DIR=${HOME}/fluidd
+#dwc2
+DWC2FK_DIR=${HOME}/dwc2-for-klipper-socket
+DWC_ENV_DIR=${HOME}/dwc-env
+DWC2_DIR=${HOME}/sdcard/web
+#octoprint
+OCTOPRINT_DIR=${HOME}/OctoPrint
+OCTOPRINT_CFG_DIR=${HOME}/.octoprint
+OCTOPRINT_SERVICE1=/etc/init.d/octoprint
+OCTOPRINT_SERVICE2=/etc/default/octoprint
+#KlipperScreen
+KLIPPERSCREEN_DIR=${HOME}/KlipperScreen
+KLIPPERSCREEN_ENV_DIR=${HOME}/.KlipperScreen-env
+#misc
+INI_FILE=${SRCDIR}/kiauh/kiauh.ini
+BACKUP_DIR=${HOME}/kiauh-backups
+
+### set github repos
+KLIPPER_REPO=https://github.com/KevinOConnor/klipper.git
+ARKSINE_REPO=https://github.com/Arksine/klipper.git
+DMBUTYUGIN_REPO=https://github.com/dmbutyugin/klipper.git
+DWC2FK_REPO=https://github.com/Stephan3/dwc2-for-klipper-socket.git
+MOONRAKER_REPO=https://github.com/Arksine/moonraker.git
+KLIPPERSCREEN_REPO=https://github.com/jordanruthe/KlipperScreen.git
+#branches
+BRANCH_SCURVE_SMOOTHING=dmbutyugin/scurve-smoothing
+BRANCH_SCURVE_SHAPING=dmbutyugin/scurve-shaping
 
 ### set some messages
 warn_msg(){
@@ -24,364 +75,35 @@ title_msg(){
   echo -e "${cyan}$1${default}"
 }
 get_date(){
-  current_date=`date +"%Y-%m-%d_%H%M%S"`
+  current_date=$(date +"%Y-%m-%d_%H-%M")
+}
+print_unkown_cmd(){
+  ERROR_MSG="Invalid command!"
 }
 
-### sourcing all additional scripts
-for script in ${HOME}/kiauh/scripts/*; do . $script; done
-
-### set important directories
-#klipper
-KLIPPER_DIR=${HOME}/klipper
-KLIPPY_ENV_DIR=${HOME}/klippy-env
-KLIPPER_SERVICE1=/etc/init.d/klipper
-KLIPPER_SERVICE2=/etc/default/klipper
-#dwc2
-DWC2FK_DIR=${HOME}/dwc2-for-klipper
-DWC2_DIR=${HOME}/sdcard/dwc2
-WEB_DWC2=${HOME}/klipper/klippy/extras/web_dwc2.py
-TORNADO_DIR1=${HOME}/klippy-env/lib/python2.7/site-packages/tornado
-TORNADO_DIR2=${HOME}/klippy-env/lib/python2.7/site-packages/tornado-5.1.1.dist-info
-#mainsail/moonraker
-MAINSAIL_DIR=${HOME}/mainsail
-MAINSAIL_SERVICE1=/etc/init.d/moonraker
-MAINSAIL_SERVICE2=/etc/default/moonraker
-#misc
-BACKUP_DIR=${HOME}/kiauh-backups
-PRINTER_CFG=${HOME}/printer.cfg
-
-### set github repos
-KLIPPER_REPO=https://github.com/KevinOConnor/klipper.git
-ARKSINE_REPO=https://github.com/Arksine/klipper.git
-DMBUTYUGIN_REPO=https://github.com/dmbutyugin/klipper.git
-DWC2FK_REPO=https://github.com/Stephan3/dwc2-for-klipper.git
-#branches
-BRANCH_MOONRAKER=Arksine/work-web_server-20200131
-BRANCH_DEV_MOONRAKER=Arksine/dev-moonraker-testing
-BRANCH_SCURVE_SMOOTHING=dmbutyugin/scurve-smoothing
-BRANCH_SCURVE_SHAPING=dmbutyugin/scurve-shaping
-
-print_error_msg(){
+print_msg(){
   if [[ "$ERROR_MSG" != "" ]]; then
     echo -e "${red}"
     echo -e "#########################################################"
-    echo -e "$ERROR_MSG "
+    echo -e " $ERROR_MSG "
+    echo -e "#########################################################"
+    echo -e "${default}"
+  fi
+  if [ "$CONFIRM_MSG" != "" ]; then
+    echo -e "${green}"
+    echo -e "#########################################################"
+    echo -e " $CONFIRM_MSG "
     echo -e "#########################################################"
     echo -e "${default}"
   fi
 }
 
-main_menu(){
-  print_header
-  print_error_msg && ERROR_MSG=""
-  #check install status
-    klipper_status
-    dwc2_status
-    mainsail_status
-    print_branch
-  main_ui
-  while true; do
-    read -p "Perform action: " action; echo
-    case "$action" in
-      0)
-        clear
-        print_header
-        ERROR_MSG=" Sorry this function is not implemented yet!"
-        print_error_msg && ERROR_MSG=""
-        main_ui;;
-      1)
-        clear
-        install_menu
-        break;;
-      2)
-        clear
-        update_menu
-        break;;
-      3)
-        clear
-        remove_menu
-        break;;
-      4)
-        clear
-        advanced_menu
-        break;;
-      5)
-        clear
-        backup_menu
-        break;;
-      Q|q)
-        exit -1;;
-      *)
-        clear
-        print_header
-        ERROR_MSG=" Unknown command '$action'"
-        print_error_msg && ERROR_MSG=""
-        main_ui;;
-    esac
-  done
-  clear; main_menu
-}
-
-install_menu(){
-  print_header
-  install_ui
-  while true; do
-    read -p "Perform action: " action; echo
-    case "$action" in
-      1)
-        clear
-        print_header
-        install_klipper
-        print_error_msg && ERROR_MSG=""
-        install_ui;;
-      2)
-        clear
-        print_header
-        dwc2_install_routine
-        print_error_msg && ERROR_MSG=""
-        install_ui;;
-      3)
-        clear
-        print_header
-        mainsail_install_routine
-        print_error_msg && ERROR_MSG=""
-        install_ui;;
-      Q|q)
-        clear; main_menu; break;;
-      *)
-        clear
-        print_header
-        ERROR_MSG=" Unknown command '$action'"
-        print_error_msg && ERROR_MSG=""
-        install_ui;;
-    esac
-  done
-  install_menu
-}
-
-update_menu(){
-  print_header
-  read_bb4u_stat
-  #compare versions
-    ui_print_versions
-  update_ui
-  while true; do
-    read -p "Perform action: " action; echo
-    case "$action" in
-      0)
-        clear
-        print_header
-        toggle_backups
-        print_error_msg && ERROR_MSG=""
-        update_ui;;
-      1)
-        clear
-        print_header
-        update_klipper && ui_print_versions
-        print_error_msg && ERROR_MSG=""
-        update_ui;;
-      2)
-        clear
-        print_header
-        update_dwc2fk && ui_print_versions
-        print_error_msg && ERROR_MSG=""
-        update_ui;;
-      3)
-        clear
-        print_header
-        update_dwc2 && ui_print_versions
-        print_error_msg && ERROR_MSG=""
-        update_ui;;
-      4)
-        clear
-        print_header
-        update_mainsail && ui_print_versions
-        print_error_msg && ERROR_MSG=""
-        update_ui;;
-      Q|q)
-        clear; main_menu; break;;
-      *)
-        clear
-        print_header
-        ERROR_MSG=" Unknown command '$action'"
-        print_error_msg && ERROR_MSG=""
-        ui_print_versions
-        update_ui;;
-    esac
-  done
-  update_menu
-}
-
-remove_menu(){
-  print_header
-  remove_ui
-  while true; do
-    read -p "Perform action: " action; echo
-    case "$action" in
-      1)
-        clear
-        print_header
-        remove_klipper
-        print_error_msg && ERROR_MSG=""
-        remove_ui;;
-      2)
-        clear
-        print_header
-        remove_dwc2
-        print_error_msg && ERROR_MSG=""
-        remove_ui;;
-      3)
-        clear
-        print_header
-        remove_mainsail
-        print_error_msg && ERROR_MSG=""
-        remove_ui;;
-      Q|q)
-        clear; main_menu; break;;
-      *)
-        clear
-        print_header
-        ERROR_MSG=" Unknown command '$action'"
-        print_error_msg && ERROR_MSG=""
-        remove_ui;;
-    esac
-  done
-  remove_menu
-}
-
-advanced_menu(){
-  print_header
-  print_error_msg && ERROR_MSG=""
-  advanced_ui
-  while true; do
-    read -p "Perform action: " action; echo
-    case "$action" in
-      1)
-        clear
-        switch_menu
-        print_error_msg && ERROR_MSG=""
-        advanced_ui;;
-      2)
-        clear
-        print_header
-        build_fw
-        print_error_msg && ERROR_MSG=""
-        advanced_ui;;
-      3)
-        clear
-        print_header
-        flash_routine
-        print_error_msg && ERROR_MSG=""
-        advanced_ui;;
-      4)
-        clear
-        print_header
-        get_usb_id
-        print_error_msg && ERROR_MSG=""
-        advanced_ui;;
-      5)
-        clear
-        print_header
-        get_usb_id && write_printer_id
-        print_error_msg && ERROR_MSG=""
-        advanced_ui;;
-      6)
-        clear
-        print_header
-        create_dwc2fk_cfg
-        print_error_msg && ERROR_MSG=""
-        advanced_ui;;
-      Q|q)
-        clear; main_menu; break;;
-      *)
-        clear
-        print_header
-        ERROR_MSG=" Unknown command '$action'"
-        print_error_msg && ERROR_MSG=""
-        advanced_ui;;
-    esac
-  done
-  advanced_menu
-}
-
-switch_menu(){
-  print_header
-  if [ -d $KLIPPER_DIR ]; then
-    read_branch
-    print_error_msg && ERROR_MSG=""
-    switch_ui
-    while true; do
-      read -p "Perform action: " action; echo
-      case "$action" in
-        1)
-          clear
-          print_header
-          switch_to_origin
-          read_branch
-          print_error_msg && ERROR_MSG=""
-          switch_ui;;
-        2)
-          clear
-          print_header
-          switch_to_scurve_shaping
-          read_branch
-          print_error_msg && ERROR_MSG=""
-          switch_ui;;
-        3)
-          clear
-          print_header
-          switch_to_scurve_smoothing
-          read_branch
-          print_error_msg && ERROR_MSG=""
-          switch_ui;;
-        4)
-          clear
-          print_header
-          switch_to_moonraker
-          read_branch
-          print_error_msg && ERROR_MSG=""
-          switch_ui;;
-        5)
-          clear
-          print_header
-          switch_to_dev_moonraker
-          read_branch
-          print_error_msg && ERROR_MSG=""
-          switch_ui;;
-        Q|q)
-          clear; advanced_menu; break;;
-      esac
-    done
-  else
-    ERROR_MSG=" No klipper directory found! Download klipper first!"
-  fi
-}
-
-backup_menu(){
-  print_header
-  print_error_msg && ERROR_MSG=""
-  backup_ui
-  while true; do
-    read -p "Perform action: " action; echo
-    case "$action" in
-      1)
-        clear
-        print_header
-        #function goes here
-        print_error_msg && ERROR_MSG=""
-        backup_ui;;
-      Q|q)
-        clear; main_menu; break;;
-      *)
-        clear
-        print_header
-        ERROR_MSG=" Unknown command '$action'"
-        print_error_msg && ERROR_MSG=""
-        backup_ui;;
-    esac
-  done
-  backup_menu
+clear_msg(){
+  unset CONFIRM_MSG
+  unset ERROR_MSG
 }
 
 check_euid
-main_menu
+init_ini
+kiauh_status
+main_menu

resources/autocommit.sh

@@ -0,0 +1,64 @@
+#!/bin/bash
+
+#####################################################################
+### Please set the paths accordingly. In case you don't have all  ###
+### the listed folders, just keep that line commented out.        ###
+#####################################################################
+### Path to your config folder you want to backup
+#config_folder=~/klipper_config
+
+### Path to your Klipper folder, by default that is '~/klipper'
+#klipper_folder=~/klipper
+
+### Path to your Moonraker folder, by default that is '~/moonraker'
+#moonraker_folder=~/moonraker
+
+### Path to your Mainsail folder, by default that is '~/mainsail'
+#mainsail_folder=~/mainsail
+
+### Path to your Fluidd folder, by default that is '~/fluidd'
+#fluidd_folder=~/fluidd
+
+#####################################################################
+#####################################################################
+
+
+#####################################################################
+################ !!! DO NOT EDIT BELOW THIS LINE !!! ################
+#####################################################################
+grab_version(){
+  if [ ! -z "$klipper_folder" ]; then
+    cd "$klipper_folder"
+    klipper_commit=$(git rev-parse --short=7 HEAD)
+    m1="Klipper on commit: $klipper_commit"
+    cd ..
+  fi
+  if [ ! -z "$moonraker_folder" ]; then
+    cd "$moonraker_folder"
+    moonraker_commit=$(git rev-parse --short=7 HEAD)
+    m2="Moonraker on commit: $moonraker_commit"
+    cd ..
+  fi
+  if [ ! -z "$mainsail_folder" ]; then
+    mainsail_file=$(find $mainsail_folder/js -name "app.*.js" 2>/dev/null)
+    mainsail_ver=$(grep -o -E 'state:{packageVersion:.+' $mainsail_file | cut -d'"' -f2)
+    m3="Mainsail version: $mainsail_ver"
+  fi
+  if [ ! -z "$fluidd_folder" ]; then
+    fluidd_file=$(find $fluidd_folder/js -name "app.*.js" 2>/dev/null)
+    fluidd_ver=$(grep -o -E '"setVersion",".+"' $fluidd_file | cut -d'"' -f4)
+    m4="Fluidd version: $fluidd_ver"
+  fi
+}
+
+push_config(){
+  cd $config_folder
+  git pull
+  git add .
+  current_date=$(date +"%Y-%m-%d %T")
+  git commit -m "Autocommit from $current_date" -m "$m1" -m "$m2" -m "$m3" -m "$m4"
+  git push
+}
+
+grab_version
+push_config

resources/common_vars_nginx.cfg

@@ -0,0 +1,6 @@
+# /etc/nginx/conf.d/common_vars.conf
+
+map $http_upgrade $connection_upgrade {
+    default upgrade;
+    '' close;
+}

resources/dwc2_nginx.cfg

@@ -0,0 +1,26 @@
+map $http_upgrade $connection_upgrade {
+    default upgrade;
+    '' close;
+}
+
+upstream dwc2 {
+    server 127.0.0.1:4750;
+}
+
+server {
+    listen 80;
+    #listen [::]:80;
+
+    location / {
+        proxy_pass http://dwc2/;
+        proxy_set_header Host $http_host;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Scheme $scheme;
+        #proxy_set_header X-Script-Name /;
+        proxy_http_version 1.1;
+        client_max_body_size 0;
+    }
+}

resources/fluidd_nginx.cfg

@@ -0,0 +1,87 @@
+# /etc/nginx/sites-available/fluidd
+
+server {
+    listen 80;
+    listen [::]:80;
+
+    access_log /var/log/nginx/fluidd-access.log;
+    error_log /var/log/nginx/fluidd-error.log;
+
+    #disable this section on smaller hardware like a pi zero
+    gzip on;
+    gzip_vary on;
+    gzip_proxied any;
+    gzip_proxied expired no-cache no-store private auth;
+    gzip_comp_level 4;
+    gzip_buffers 16 8k;
+    gzip_http_version 1.1;
+    gzip_types text/plain text/css text/xml text/javascript application/x-javascript application/json application/xml;
+
+    #web_path from fluidd static files
+    root /home/pi/fluidd;
+
+    index index.html;
+    server_name _;
+
+    #max upload size for gcodes
+    client_max_body_size 0;
+
+    location / {
+        try_files $uri $uri/ /index.html;
+    }
+
+    location /printer {
+        proxy_pass http://apiserver/printer;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Scheme $scheme;
+    }
+
+    location /api {
+        proxy_pass http://apiserver/api;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Scheme $scheme;
+    }
+
+    location /access {
+        proxy_pass http://apiserver/access;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Scheme $scheme;
+    }
+
+    location /websocket {
+        proxy_pass http://apiserver/websocket;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $connection_upgrade;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_read_timeout 86400;
+    }
+
+    location /machine {
+        proxy_pass http://apiserver/machine;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Scheme $scheme;
+    }
+
+    location /server {
+        proxy_pass http://apiserver/server;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Scheme $scheme;
+    }
+
+    location /webcam/ {
+        proxy_pass http://mjpgstreamer/;
+    }
+}

resources/gcode_shell_command.py

@@ -0,0 +1,83 @@
+# Run a shell command via gcode
+#
+# Copyright (C) 2019  Eric Callahan <arksine.code@gmail.com>
+#
+# This file may be distributed under the terms of the GNU GPLv3 license.
+import os
+import shlex
+import subprocess
+import logging
+
+class ShellCommand:
+    def __init__(self, config):
+        self.name = config.get_name().split()[-1]
+        self.printer = config.get_printer()
+        self.gcode = self.printer.lookup_object('gcode')
+        cmd = config.get('command')
+        cmd = os.path.expanduser(cmd)
+        self.command = shlex.split(cmd)
+        self.timeout = config.getfloat('timeout', 2., above=0.)
+        self.verbose = config.getboolean('verbose', True)
+        self.proc_fd = None
+        self.partial_output = ""
+        self.gcode.register_mux_command(
+            "RUN_SHELL_COMMAND", "CMD", self.name,
+            self.cmd_RUN_SHELL_COMMAND,
+            desc=self.cmd_RUN_SHELL_COMMAND_help)
+
+    def _process_output(self, eventime):
+        if self.proc_fd is None:
+            return
+        try:
+            data = os.read(self.proc_fd, 4096)
+        except Exception:
+            pass
+        data = self.partial_output + data
+        if '\n' not in data:
+            self.partial_output = data
+            return
+        elif data[-1] != '\n':
+            split = data.rfind('\n') + 1
+            self.partial_output = data[split:]
+            data = data[:split]
+        self.gcode.respond_info(data)
+
+    cmd_RUN_SHELL_COMMAND_help = "Run a linux shell command"
+    def cmd_RUN_SHELL_COMMAND(self, params):
+        reactor = self.printer.get_reactor()
+        try:
+            proc = subprocess.Popen(
+                self.command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        except Exception:
+            logging.exception(
+                "shell_command: Command {%s} failed" % (self.name))
+            raise self.gcode.error("Error running command {%s}" % (self.name))
+        if self.verbose:
+            self.proc_fd = proc.stdout.fileno()
+            self.gcode.respond_info("Running Command {%s}...:" % (self.name))
+            hdl = reactor.register_fd(self.proc_fd, self._process_output)
+        eventtime = reactor.monotonic()
+        endtime = eventtime + self.timeout
+        complete = False
+        while eventtime < endtime:
+            eventtime = reactor.pause(eventtime + .05)
+            if proc.poll() is not None:
+                complete = True
+                break
+        if not complete:
+            proc.terminate()
+        if self.verbose:
+            if self.partial_output:
+                self.gcode.respond_info(self.partial_output)
+                self.partial_output = ""
+            if complete:
+                msg = "Command {%s} finished\n" % (self.name)
+            else:
+                msg = "Command {%s} timed out" % (self.name)
+            self.gcode.respond_info(msg)
+            reactor.unregister_fd(hdl)
+            self.proc_fd = None
+
+
+def load_config_prefix(config):
+    return ShellCommand(config)

resources/mainsail_nginx.cfg

@@ -0,0 +1,87 @@
+# /etc/nginx/sites-available/mainsail
+
+server {
+    listen 80;
+    listen [::]:80;
+
+    access_log /var/log/nginx/mainsail-access.log;
+    error_log /var/log/nginx/mainsail-error.log;
+
+    #disable this section on smaller hardware like a pi zero
+    gzip on;
+    gzip_vary on;
+    gzip_proxied any;
+    gzip_proxied expired no-cache no-store private auth;
+    gzip_comp_level 4;
+    gzip_buffers 16 8k;
+    gzip_http_version 1.1;
+    gzip_types text/plain text/css text/xml text/javascript application/x-javascript application/json application/xml;
+
+    #web_path from mainsail static files
+    root /home/pi/mainsail;
+
+    index index.html;
+    server_name _;
+
+    #max upload size for gcodes
+    client_max_body_size 0;
+
+    location / {
+        try_files $uri $uri/ /index.html;
+    }
+
+    location /printer {
+        proxy_pass http://apiserver/printer;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Scheme $scheme;
+    }
+
+    location /api {
+        proxy_pass http://apiserver/api;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Scheme $scheme;
+    }
+
+    location /access {
+        proxy_pass http://apiserver/access;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Scheme $scheme;
+    }
+
+    location /websocket {
+        proxy_pass http://apiserver/websocket;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $connection_upgrade;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_read_timeout 86400;
+    }
+
+    location /machine {
+        proxy_pass http://apiserver/machine;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Scheme $scheme;
+    }
+
+    location /server {
+        proxy_pass http://apiserver/server;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Scheme $scheme;
+    }
+
+    location /webcam/ {
+        proxy_pass http://mjpgstreamer/;
+    }
+}

resources/moonraker.conf

@@ -0,0 +1,10 @@
+[server]
+host: 0.0.0.0
+port: 7125
+enable_debug_logging: True
+config_path: ~/klipper_config
+
+[authorization]
+enabled: True
+trusted_clients:
+    127.0.0.1

resources/moonraker_nginx.cfg

@@ -0,0 +1,13 @@
+# /etc/nginx/conf.d/upstreams.conf
+
+upstream apiserver {
+    #edit your api port here
+    ip_hash;
+    server 127.0.0.1:7125;
+}
+
+upstream mjpgstreamer {
+    #edit your webcam port here
+    ip_hash;
+    server 127.0.0.1:8080;
+}

resources/octoprint_config.cfg

@@ -0,0 +1,10 @@
+serial:
+    additionalPorts:
+    - /tmp/printer
+    disconnectOnErrors: false
+    port: /tmp/printer
+server:
+    commands:
+        serverRestartCommand: sudo service octoprint restart
+        systemRestartCommand: sudo shutdown -r now
+        systemShutdownCommand: sudo shutdown -h now

resources/octoprint_nginx.cfg

@@ -0,0 +1,40 @@
+map $http_upgrade $connection_upgrade {
+    default upgrade;
+    '' close;
+}
+
+upstream octoprint {
+    server 127.0.0.1:5000;
+}
+
+upstream mjpg-streamer {
+    server 127.0.0.1:8080;
+}
+
+server {
+    listen 80;
+    #listen [::]:80;
+
+    location / {
+        proxy_pass http://octoprint/;
+        proxy_set_header Host $http_host;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Scheme $scheme;
+        #proxy_set_header X-Script-Name /;
+        proxy_http_version 1.1;
+        client_max_body_size 0;
+    }
+
+    location /webcam {
+        proxy_pass http://mjpg-streamer/;
+    }
+
+    # redirect server error pages to the static page /50x.html
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   html;
+    }
+}

resources/webui_macros.cfg

@@ -0,0 +1,38 @@
+### AUTOCREATED WITH KIAUH ###
+#is required to load the pause_resume module in klipper
+[pause_resume]
+
+[gcode_macro PAUSE]
+rename_existing: BASE_PAUSE
+default_parameter_X: 230    #edit to your park position
+default_parameter_Y: 230    #edit to your park position
+default_parameter_Z: 10     #edit to your park position
+default_parameter_E: 1      #edit to your retract length
+gcode:
+    SAVE_GCODE_STATE NAME=PAUSE_state
+    BASE_PAUSE
+    G91
+    G1 E-{E} F2100
+    G1 Z{Z}
+    G90
+    G1 X{X} Y{Y} F6000
+
+[gcode_macro RESUME]
+rename_existing: BASE_RESUME
+default_parameter_E: 1      #edit to your retract length
+gcode:
+    G91
+    G1 E{E} F2100
+    G90
+    RESTORE_GCODE_STATE NAME=PAUSE_state MOVE=1
+    BASE_RESUME
+
+[gcode_macro CANCEL_PRINT]
+rename_existing: BASE_CANCEL_PRINT
+gcode:
+    TURN_OFF_HEATERS
+    CLEAR_PAUSE
+    SDCARD_RESET_FILE
+    BASE_CANCEL_PRINT
+##########################
+##########################

scripts/backup.sh

@@ -1,17 +1,32 @@
-backup_printer_cfg(){
+check_for_backup_dir(){
   if [ ! -d $BACKUP_DIR ]; then
-    status_msg "Create backup directory ..."
+    status_msg "Create KIAUH backup directory ..."
     mkdir -p $BACKUP_DIR && ok_msg "Directory created!"
   fi
+}
+
+backup_printer_cfg(){
+  check_for_backup_dir
   if [ -f $PRINTER_CFG ]; then
     get_date
     status_msg "Create backup of printer.cfg ..."
-    cp $PRINTER_CFG $BACKUP_DIR/printer.cfg."$current_date".backup && ok_msg "Backup created!"
+    cp $PRINTER_CFG $BACKUP_DIR/printer.cfg."$current_date".backup && ok_msg "Backup complete!"
   else
     ok_msg "No printer.cfg found! Skipping backup ..."
   fi
 }
 
+backup_moonraker_conf(){
+  check_for_backup_dir
+  if [ -f ${HOME}/moonraker.conf ]; then
+    get_date
+    status_msg "Create backup of moonraker.conf ..."
+    cp ${HOME}/moonraker.conf $BACKUP_DIR/moonraker.conf."$current_date".backup && ok_msg "Backup complete!"
+  else
+    ok_msg "No moonraker.conf found! Skipping backup ..."
+  fi
+}
+
 read_bb4u_stat(){
   source_ini
   if [ ! "$backup_before_update" = "true" ]; then
@@ -24,51 +39,114 @@ read_bb4u_stat(){
 toggle_backups(){
   source_ini
   if [ "$backup_before_update" = "true" ]; then
-    sed -i '/backup_before_update=/s/true/false/' ${HOME}/kiauh2/kiauh.ini
+    sed -i '/backup_before_update=/s/true/false/' $INI_FILE
     BB4U_STATUS="${green}[Enable]${default} backups before updating                  "
+    CONFIRM_MSG=" Backups before updates are now >>> DISABLED <<< !"
   fi
   if [ "$backup_before_update" = "false" ]; then
-    sed -i '/backup_before_update=/s/false/true/' ${HOME}/kiauh2/kiauh.ini
+    sed -i '/backup_before_update=/s/false/true/' $INI_FILE
     BB4U_STATUS="${red}[Disable]${default} backups before updating                 "
+    CONFIRM_MSG=" Backups before updates are now >>> ENABLED <<< !"
   fi
 }
 
-bb4u_klipper(){
+bb4u(){
   source_ini
-  if [ -d $KLIPPER_DIR ] && [ "$backup_before_update" = "true" ]; then
-    get_date
+  if [ "$backup_before_update" = "true" ]; then
+    backup_$1
+  fi
+}
+
+backup_klipper(){
+  if [ -d $KLIPPER_DIR ] && [ -d $KLIPPY_ENV_DIR ]; then
     status_msg "Creating Klipper backup ..."
+    check_for_backup_dir
+    get_date
+    status_msg "Timestamp: $current_date"
     mkdir -p $BACKUP_DIR/klipper-backups/"$current_date"
     cp -r $KLIPPER_DIR $_ && cp -r $KLIPPY_ENV_DIR $_ && ok_msg "Backup complete!"
+  else
+    ERROR_MSG=" Can't backup klipper and/or klipper-env directory! Not found!"
   fi
 }
 
-bb4u_dwc2fk(){
-  source_ini
-  if [ -d $DWC2FK_DIR ] && [ "$backup_before_update" = "true" ]; then
-    get_date
-    status_msg "Creating DWC2-for-Klipper backup ..."
-    mkdir -p $BACKUP_DIR/dwc2-for-klipper-backups/"$current_date"
-    cp -r $DWC2FK_DIR $_ && ok_msg "Backup complete!"
-  fi
-}
-
-bb4u_dwc2(){
-  source_ini
-  if [ -d $DWC2_DIR ] && [ "$backup_before_update" = "true" ]; then
-    get_date
+backup_dwc2(){
+  if [ -d $DWC2FK_DIR ] && [ -d $DWC_ENV_DIR ] && [ -d $DWC2_DIR ]; then
     status_msg "Creating DWC2 Web UI backup ..."
+    check_for_backup_dir
+    get_date
+    status_msg "Timestamp: $current_date"
     mkdir -p $BACKUP_DIR/dwc2-backups/"$current_date"
-    cp -r $DWC2_DIR $_ && ok_msg "Backup complete!"
+    cp -r $DWC2FK_DIR $_ && cp -r $DWC_ENV_DIR $_ && cp -r $DWC2_DIR $_
+    ok_msg "Backup complete!"
+  else
+    ERROR_MSG=" Can't backup dwc2-for-klipper-socket and/or dwc2 directory!\n Not found!"
   fi
 }
 
-bb4u_mainsail(){
-  source_ini
-  if [ -d $MAINSAIL_DIR ] && [ "$backup_before_update" = "true" ]; then
-    get_date
+backup_mainsail(){
+  if [ -d $MAINSAIL_DIR ]; then
     status_msg "Creating Mainsail backup ..."
+    check_for_backup_dir
+    get_date
+    status_msg "Timestamp: $current_date"
     mkdir -p $BACKUP_DIR/mainsail-backups/"$current_date"
     cp -r $MAINSAIL_DIR $_ && ok_msg "Backup complete!"
+  else
+    ERROR_MSG=" Can't backup mainsail directory! Not found!"
   fi
-}
+}
+
+backup_fluidd(){
+  if [ -d $FLUIDD_DIR ]; then
+    status_msg "Creating Fluidd backup ..."
+    check_for_backup_dir
+    get_date
+    status_msg "Timestamp: $current_date"
+    mkdir -p $BACKUP_DIR/fluidd-backups/"$current_date"
+    cp -r $FLUIDD_DIR $_ && ok_msg "Backup complete!"
+  else
+    ERROR_MSG=" Can't backup fluidd directory! Not found!"
+  fi
+}
+
+backup_moonraker(){
+  if [ -d $MOONRAKER_DIR ] && [ -d $MOONRAKER_ENV_DIR ]; then
+    status_msg "Creating Moonraker backup ..."
+    check_for_backup_dir
+    get_date
+    status_msg "Timestamp: $current_date"
+    mkdir -p $BACKUP_DIR/moonraker-backups/"$current_date"
+    cp -r $MOONRAKER_DIR $_ && cp -r $MOONRAKER_ENV_DIR $_ && ok_msg "Backup complete!"
+  else
+    ERROR_MSG=" Can't backup moonraker and/or moonraker-env directory! Not found!"
+  fi
+}
+
+backup_octoprint(){
+  if [ -d $OCTOPRINT_DIR ] && [ -d $OCTOPRINT_CFG_DIR ]; then
+    status_msg "Creating OctoPrint backup ..."
+    check_for_backup_dir
+    get_date
+    status_msg "Timestamp: $current_date"
+    mkdir -p $BACKUP_DIR/octoprint-backups/"$current_date"
+    cp -r $OCTOPRINT_DIR $_ && cp -r $OCTOPRINT_CFG_DIR $_
+    ok_msg "Backup complete!"
+  else
+    ERROR_MSG=" Can't backup OctoPrint and/or .octoprint directory!\n Not found!"
+  fi
+}
+
+backup_klipperscreen(){
+  if [ -d $KLIPPERSCREEN_DIR ] ; then
+    status_msg "Creating KlipperScreen backup ..."
+    check_for_backup_dir
+    get_date
+    status_msg "Timestamp: $current_date"
+    mkdir -p $BACKUP_DIR/klipperscreen-backups/"$current_date"
+    cp -r $KLIPPERSCREEN_DIR $_
+    ok_msg "Backup complete!"
+  else
+    ERROR_MSG=" Can't backup KlipperScreen directory!\n Not found!"
+  fi
+}

scripts/dwc2-for-klipper-socket-installer/dwc-start.sh

@@ -0,0 +1,54 @@
+#!/bin/sh
+# System startup script for dwc2-for-klipper-socket
+
+### BEGIN INIT INFO
+# Provides:          dwc2-for-klipper-socket
+# Required-Start:    $local_fs
+# Required-Stop:
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: dwc2-for-klipper-socket daemon
+# Description:       Starts the dwc2-for-klipper-socket daemon.
+### END INIT INFO
+
+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+DESC="dwc2-for-klipper-socket daemon"
+NAME="dwc2-for-klipper-socket"
+DEFAULTS_FILE=/etc/default/dwc
+PIDFILE=/var/run/dwc.pid
+
+. /lib/lsb/init-functions
+
+# Read defaults file
+[ -r $DEFAULTS_FILE ] && . $DEFAULTS_FILE
+
+case "$1" in
+start)  log_daemon_msg "Starting dwc2-for-klipper-socket" $NAME
+        start-stop-daemon --start --quiet --exec $DWC_EXEC \
+                          --background --pidfile $PIDFILE --make-pidfile \
+                          --chuid $DWC_USER --user $DWC_USER \
+                          -- $DWC_ARGS
+        log_end_msg $?
+        ;;
+stop)   log_daemon_msg "Stopping dwc2-for-klipper-socket" $NAME
+        killproc -p $PIDFILE $DWC_EXEC
+        RETVAL=$?
+        [ $RETVAL -eq 0 ] && [ -e "$PIDFILE" ] && rm -f $PIDFILE
+        log_end_msg $RETVAL
+        ;;
+restart) log_daemon_msg "Restarting dwc2-for-klipper-socket" $NAME
+        $0 stop
+        $0 start
+        ;;
+reload|force-reload)
+        log_daemon_msg "Reloading configuration not supported" $NAME
+        log_end_msg 1
+        ;;
+status)
+        status_of_proc -p $PIDFILE $DWC_EXEC $NAME && exit 0 || exit $?
+        ;;
+*)      log_action_msg "Usage: /etc/init.d/dwc {start|stop|status|restart|reload|force-reload}"
+        exit 2
+        ;;
+esac
+exit 0

scripts/dwc2-for-klipper-socket-installer/install-debian.sh

@@ -0,0 +1,106 @@
+#!/bin/bash
+# This script installs dwc2-for-klipper-socket on a Raspberry Pi machine running
+# Raspbian/Raspberry Pi OS based distributions.
+
+# https://github.com/Stephan3/dwc2-for-klipper-socket.git
+
+PYTHONDIR="${HOME}/dwc-env"
+SYSTEMDDIR="/etc/systemd/system"
+DWC_USER=${USER}
+
+# Step 1:  Verify Klipper has been installed
+check_klipper()
+{
+    if [ "$(systemctl list-units --full -all -t service --no-legend | grep -F "klipper.service")" ]; then
+        echo "Klipper service found!"
+    else
+        echo "Klipper service not found, please install Klipper first"
+        exit -1
+    fi
+
+}
+
+# Step 2: Install packages
+install_packages()
+{
+    PKGLIST="python3-virtualenv python3-dev python3-tornado"
+
+    # Update system package info
+    report_status "Running apt-get update..."
+    sudo apt-get update
+
+    # Install desired packages
+    report_status "Installing packages..."
+    sudo apt-get install --yes ${PKGLIST}
+}
+
+# Step 3: Create python virtual environment
+create_virtualenv()
+{
+    report_status "Updating python virtual environment..."
+
+    # Create virtualenv if it doesn't already exist
+    [ ! -d ${PYTHONDIR} ] && virtualenv -p /usr/bin/python3 ${PYTHONDIR}
+
+    # Install/update dependencies
+    ${PYTHONDIR}/bin/pip install tornado==6.0.4
+}
+
+# Step 4: Install startup script
+install_script(){
+    report_status "Installing system start script..."
+    sudo /bin/sh -c "cat > $SYSTEMDDIR/dwc.service" << EOF
+#Systemd service file for DWC
+[Unit]
+Description=dwc_webif
+After=network.target
+
+[Install]
+WantedBy=multi-user.target
+
+[Service]
+Type=simple
+User=$DWC_USER
+RemainAfterExit=yes
+ExecStart=${PYTHONDIR}/bin/python3 ${SRCDIR}/web_dwc2.py
+Restart=always
+RestartSec=10
+EOF
+# Use systemctl to enable the klipper systemd service script
+    sudo systemctl enable dwc.service
+}
+
+# Step 5: Start DWC service
+start_software()
+{
+    report_status "Launching dwc2-for-klipper-socket..."
+    sudo systemctl start dwc
+}
+
+# Helper functions
+report_status()
+{
+    echo -e "\n\n###### $1"
+}
+
+verify_ready()
+{
+    if [ "$EUID" -eq 0 ]; then
+        echo "This script must not run as root"
+        exit -1
+    fi
+}
+
+# Force script to exit if an error occurs
+set -e
+
+# Find SRCDIR from the pathname of this script
+SRCDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
+
+# Run installation steps defined above
+verify_ready
+check_klipper
+install_packages
+create_virtualenv
+install_script
+start_software

scripts/dwc2-for-klipper-socket-installer/install-octopi.sh

@@ -0,0 +1,106 @@
+#!/bin/bash
+# This script installs dwc2-for-klipper-socket on a Raspberry Pi machine running
+# Raspbian/Raspberry Pi OS based distributions.
+
+# https://github.com/Stephan3/dwc2-for-klipper-socket.git
+
+PYTHONDIR="${HOME}/dwc-env"
+
+# Step 1:  Verify Klipper has been installed
+check_klipper()
+{
+    if [ "$(systemctl list-units --full -all -t service --no-legend | grep -F "klipper.service")" ]; then
+        echo "Klipper service found!"
+    else
+        echo "Klipper service not found, please install Klipper first"
+        exit -1
+    fi
+
+}
+
+# Step 2: Install packages
+install_packages()
+{
+    PKGLIST="python3-virtualenv python3-dev python3-tornado"
+
+    # Update system package info
+    report_status "Running apt-get update..."
+    sudo apt-get update
+
+    # Install desired packages
+    report_status "Installing packages..."
+    sudo apt-get install --yes ${PKGLIST}
+}
+
+# Step 3: Create python virtual environment
+create_virtualenv()
+{
+    report_status "Updating python virtual environment..."
+
+    # Create virtualenv if it doesn't already exist
+    [ ! -d ${PYTHONDIR} ] && virtualenv -p /usr/bin/python3 ${PYTHONDIR}
+
+    # Install/update dependencies
+    ${PYTHONDIR}/bin/pip install tornado==6.0.4
+}
+
+# Step 4: Install startup script
+install_script(){
+    report_status "Installing system start script..."
+    sudo cp "${SRCDIR}/scripts/dwc-start.sh" /etc/init.d/dwc
+    sudo update-rc.d dwc defaults
+}
+
+# Step 5: Install startup script config
+install_config(){
+    DEFAULTS_FILE=/etc/default/dwc
+    [ -f $DEFAULTS_FILE ] && return
+
+    report_status "Installing system start configuration..."
+    sudo /bin/sh -c "cat > $DEFAULTS_FILE" <<EOF
+# Configuration for /etc/init.d/dwc
+DWC_USER=$USER
+
+DWC_EXEC=${PYTHONDIR}/bin/python3
+
+DWC_ARGS="${SRCDIR}/web_dwc2.py"
+EOF
+}
+
+# Step 4: Start server
+start_software()
+{
+    report_status "Launching dwc2-for-klipper-socket..."
+    sudo /etc/init.d/klipper stop
+    sudo /etc/init.d/dwc restart
+    sudo /etc/init.d/klipper start
+}
+
+# Helper functions
+report_status()
+{
+    echo -e "\n\n###### $1"
+}
+
+verify_ready()
+{
+    if [ "$EUID" -eq 0 ]; then
+        echo "This script must not run as root"
+        exit -1
+    fi
+}
+
+# Force script to exit if an error occurs
+set -e
+
+# Find SRCDIR from the pathname of this script
+SRCDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
+
+# Run installation steps defined above
+verify_ready
+check_klipper
+install_packages
+create_virtualenv
+install_script
+install_config
+start_software

scripts/dwc2-for-klipper-socket-installer/uninstall-debian.sh

@@ -0,0 +1,41 @@
+stop_service() {
+    # Stop DWC Service
+    echo "#### Stopping DWC Service.."
+    sudo systemctl stop dwc
+    sudo systemctl disable dwc
+}
+
+remove_service() {
+    # Remove DWC from Services
+    echo
+    echo "#### Removing DWC Service.."
+    sudo rm -f /etc/systemd/system/dwc.service
+    sudo systemctl daemon-reload
+}
+
+remove_files() {
+    # Remove virtualenv
+    if [ -d ~/dwc-env ]; then
+        echo "Removing virtualenv..."
+        rm -rf ~/dwc-env
+    else
+        echo "No DWC virtualenv found"
+    fi
+
+    # Notify user of method to remove DWC source code
+    echo
+    echo "The DWC system files and virtualenv have been removed."
+}
+
+verify_ready()
+{
+    if [ "$EUID" -eq 0 ]; then
+        echo "This script must not run as root"
+        exit -1
+    fi
+}
+
+verify_ready
+stop_service
+remove_service
+remove_files

scripts/dwc2-for-klipper-socket-installer/uninstall-octopi.sh

@@ -0,0 +1,45 @@
+stop_service() {
+    # Stop DWC Service
+    echo "#### Stopping DWC Service.."
+    sudo service dwc stop
+}
+
+remove_service() {
+    # Remove DWC from Startup
+    echo
+    echo "#### Removing DWC from Startup.."
+    sudo update-rc.d -f dwc remove
+
+    # Remove DWC from Services
+    echo
+    echo "#### Removing DWC Service.."
+    sudo rm -f /etc/init.d/dwc /etc/default/dwc
+
+}
+
+remove_files() {
+    # Remove virtualenv
+    if [ -d ~/dwc-env ]; then
+        echo "Removing virtualenv..."
+        rm -rf ~/dwc-env
+    else
+        echo "No DWC virtualenv found"
+    fi
+
+    # Notify user of method to remove DWC source code
+    echo
+    echo "The DWC system files and virtualenv have been removed."
+}
+
+verify_ready()
+{
+    if [ "$EUID" -eq 0 ]; then
+        echo "This script must not run as root"
+        exit -1
+    fi
+}
+
+verify_ready
+stop_service
+remove_service
+remove_files

scripts/functions.sh

@@ -3,64 +3,187 @@ check_euid(){
   if [ "$EUID" -eq 0 ]
   then
     echo -e "${red}"
-    echo -e "/=================================================\ "
-    echo -e "|    !!! THIS SCRIPT MUST NOT RAN AS ROOT !!!     |"
-    echo -e "\=================================================/ "
+    top_border
+    echo -e "|       !!! THIS SCRIPT MUST NOT RAN AS ROOT !!!        |"
+    bottom_border
     echo -e "${default}"
     exit 1
   fi
 }
 
+locate_printer_cfg(){
+  unset PRINTER_CFG
+  if [ -e $KLIPPER_SERVICE2 ]; then
+    status_msg "Locating printer.cfg via $KLIPPER_SERVICE2 ..."
+    #reads /etc/default/klipper and gets the default printer.cfg location
+    KLIPPY_ARGS_LINE="$(grep "KLIPPY_ARGS=" /etc/default/klipper)"
+    KLIPPY_ARGS_COUNT="$(grep -o " " <<< "$KLIPPY_ARGS_LINE" | wc -l)"
+    i=1
+    PRINTER_CFG=$(while [ "$i" != "$KLIPPY_ARGS_COUNT" ]; do grep -E "(\/[A-Za-z0-9\_-]+)+\/printer\.cfg" /etc/default/klipper | cut -d" " -f"$i"; i=$(( $i + 1 )); done | grep "printer.cfg")
+    ok_msg "printer.cfg location: '$PRINTER_CFG'"
+  elif [ -e $KLIPPER_SERVICE3 ]; then
+    status_msg "Locating printer.cfg via $KLIPPER_SERVICE3 ..."
+    #reads /etc/systemd/system/klipper.service and gets the default printer.cfg location
+    KLIPPY_ARGS_LINE="$(grep "ExecStart=" /etc/systemd/system/klipper.service)"
+    KLIPPY_ARGS_COUNT="$(grep -o " " <<< "$KLIPPY_ARGS_LINE" | wc -l)"
+    i=1
+    PRINTER_CFG=$(while [ "$i" != "$KLIPPY_ARGS_COUNT" ]; do grep -E "(\/[A-Za-z0-9\_-]+)+\/printer\.cfg" /etc/systemd/system/klipper.service | cut -d" " -f"$i"; i=$(( $i + 1 )); done | grep "printer.cfg")
+    ok_msg "printer.cfg location: '$PRINTER_CFG'"
+  else
+    PRINTER_CFG=""
+    warn_msg "Can't read printer.cfg location!"
+  fi
+}
+
 source_ini(){
-  source ${HOME}/kiauh2/kiauh.ini
+  source ${SRCDIR}/kiauh/kiauh.ini
 }
 
 start_klipper(){
-  if [ -e /etc/init.d/klipper ]; then
-    status_msg "Starting klipper service ..."
-    sudo /etc/init.d/klipper start && sleep 2 && ok_msg "Klipper service started!"
-  fi
+  status_msg "Starting Klipper Service ..."
+  sudo systemctl start klipper && ok_msg "Klipper Service started!"
 }
+
 stop_klipper(){
-  if [ -e /etc/init.d/klipper ]; then
-    status_msg "Stopping klipper service ..."
-    sudo /etc/init.d/klipper stop && sleep 2 && ok_msg "Klipper service stopped!"
-  fi
+  status_msg "Stopping Klipper Service ..."
+  sudo systemctl stop klipper && ok_msg "Klipper Service stopped!"
+}
+
+restart_klipper(){
+  status_msg "Restarting Klipper Service ..."
+  sudo systemctl restart klipper && ok_msg "Klipper Service restarted!"
+}
+
+start_dwc(){
+  status_msg "Starting DWC-for-Klipper-Socket Service ..."
+  sudo systemctl start dwc && ok_msg "DWC-for-Klipper-Socket Service started!"
+}
+
+stop_dwc(){
+  status_msg "Stopping DWC-for-Klipper-Socket Service ..."
+  sudo systemctl stop dwc && ok_msg "DWC-for-Klipper-Socket Service stopped!"
 }
 
 start_moonraker(){
-  if [ -e /etc/init.d/moonraker ]; then
-    status_msg "Starting moonraker service ..."
-    sudo /etc/init.d/moonraker start && sleep 2 && ok_msg "Moonraker service started!"
-  fi
+  status_msg "Starting Moonraker Service ..."
+  sudo systemctl start moonraker && ok_msg "Moonraker Service started!"
 }
 
 stop_moonraker(){
-  if [ -e /etc/init.d/moonraker ]; then
-    status_msg "Stopping moonraker service ..."
-    sudo /etc/init.d/moonraker stop && sleep 2 && ok_msg "Moonraker service stopped!"
+  status_msg "Stopping Moonraker Service ..."
+  sudo systemctl stop moonraker && ok_msg "Moonraker Service stopped!"
+}
+
+restart_moonraker(){
+  status_msg "Restarting Moonraker Service ..."
+  sudo systemctl restart moonraker && ok_msg "Moonraker Service restarted!"
+}
+
+start_octoprint(){
+  status_msg "Starting OctoPrint Service ..."
+  sudo systemctl start octoprint && ok_msg "OctoPrint Service started!"
+}
+
+stop_octoprint(){
+  status_msg "Stopping OctoPrint Service ..."
+  sudo systemctl stop octoprint && ok_msg "OctoPrint Service stopped!"
+}
+
+restart_octoprint(){
+  status_msg "Restarting OctoPrint Service ..."
+  sudo systemctl restart octoprint && ok_msg "OctoPrint Service restarted!"
+}
+
+enable_octoprint_service(){
+  if [[ -f $OCTOPRINT_SERVICE1 && -f $OCTOPRINT_SERVICE2 ]]; then
+    status_msg "OctoPrint Service is disabled! Enabling now ..."
+    sudo systemctl enable octoprint -q && sudo systemctl start octoprint
   fi
 }
 
-dep_check(){
-  for package in "${dep[@]}"
+disable_octoprint(){
+  if [ "$DISABLE_OPRINT" = "true" ]; then
+    disable_octoprint_service
+  fi
+}
+
+disable_octoprint_service(){
+  if [[ -f $OCTOPRINT_SERVICE1 && -f $OCTOPRINT_SERVICE2 ]]; then
+    status_msg "OctoPrint Service is enabled! Disabling now ..."
+    sudo systemctl stop octoprint && sudo systemctl disable octoprint -q
+  fi
+}
+
+toggle_octoprint_service(){
+  if [[ -f $OCTOPRINT_SERVICE1 && -f $OCTOPRINT_SERVICE2 ]]; then
+    if systemctl is-enabled octoprint.service -q; then
+      disable_octoprint_service
+      sleep 2
+      CONFIRM_MSG=" OctoPrint Service is now >>> DISABLED <<< !"
+    else
+      enable_octoprint_service
+      sleep 2
+      CONFIRM_MSG=" OctoPrint Service is now >>> ENABLED <<< !"
+    fi
+  else
+    ERROR_MSG=" You cannot activate a service that does not exist!"
+  fi
+}
+
+read_octoprint_service_status(){
+  if ! systemctl is-enabled octoprint.service -q &>/dev/null; then
+    OPRINT_SERVICE_STATUS="${green}[Enable]${default} OctoPrint Service                        "
+  else
+    OPRINT_SERVICE_STATUS="${red}[Disable]${default} OctoPrint Service                       "
+  fi
+}
+
+start_klipperscreen(){
+  status_msg "Starting KlipperScreen Service ..."
+  sudo systemctl start KlipperScreen && ok_msg "KlipperScreen Service started!"
+}
+
+stop_klipperscreen(){
+  status_msg "Stopping KlipperScreen Service ..."
+  sudo systemctl stop KlipperScreen && ok_msg "KlipperScreen Service stopped!"
+}
+
+restart_klipperscreen(){
+  status_msg "Restarting KlipperScreen Service ..."
+  sudo systemctl restart KlipperScreen && ok_msg "KlipperScreen Service restarted!"
+}
+
+restart_nginx(){
+  if [ "$(systemctl list-units --full -all -t service --no-legend | grep -F "nginx.service")" ]; then
+    status_msg "Restarting Nginx Service ..."
+    sudo systemctl restart nginx && ok_msg "Nginx Service restarted!"
+  fi
+}
+
+dependency_check(){
+  status_msg "Checking for the following dependencies:"
+  #check if package is installed, if not write name into array
+  for pkg in "${dep[@]}"
   do
-    ! command -v $package >&/dev/null 2>&1 && install+=($package)
-  done
-  if ! [ ${#install[@]} -eq 0 ]; then
-  warn_msg "The following packages are missing but necessary:"
-  echo ${install[@]}
-  while true; do
-    read -p "Do you want to install them now? (Y/n): " yn
-    case "$yn" in
-      Y|y|Yes|yes|"")
-      status_msg "Installing dependencies ..."
-      sudo apt-get install ${install[@]} -y && ok_msg "Dependencies installed!"
-      break;;
-      N|n|No|no) break;;
-         *) echo "Unknown parameter: $yn"; echo;;
-    esac
+    echo -e "${cyan}● $pkg ${default}"
+    if [[ ! $(dpkg-query -f'${Status}' --show $pkg 2>/dev/null) = *\ installed ]]; then
+      inst+=($pkg)
+    fi
   done
+  #if array is not empty, install packages from array elements
+  if [ "${#inst[@]}" != "0" ]; then
+    status_msg "Installing the following dependencies:"
+    for element in ${inst[@]}
+    do
+      echo -e "${cyan}● $element ${default}"
+    done
+    echo
+    sudo apt-get install ${inst[@]} -y
+    ok_msg "Dependencies installed!"
+    #clearing the array
+    unset inst
+  else
+    ok_msg "Dependencies already met! Continue..."
   fi
 }
 
@@ -75,111 +198,180 @@ print_error(){
   done
   sum=$(IFS=+; echo "$((${data_count[*]}))")
   if [ $sum -eq 0 ]; then
-    ERROR_MSG=" Looks like $1 was already removed!\n Skipping..."
+    ERROR_MSG="Looks like $1 was already removed!\n Skipping..."
   else
     ERROR_MSG=""
   fi
 }
 
-pkg_check(){
-  status_msg "Checking if nginx is installed"
-  if [[ $(dpkg-query -f'${Status}' --show nginx 2>/dev/null) = *\ installed ]]; then
-echo "nginx found!"
-else
-echo "nginx was not found, installing..." 2>&1
-sudo apt-get -y install nginx 2>/dev/null
-fi
-}
-
-build_fw(){
-    if [ -d $KLIPPER_DIR ]; then
-      cd $KLIPPER_DIR && make menuconfig
-      status_msg "Building firmware ..."
-      make clean && make && ok_msg "Firmware built!"
-    else
-      warn_msg "Can not build firmware without a Klipper directory!"
-    fi
-}
-
-### grab the printers id
-get_usb_id(){
-  warn_msg "Make sure your printer is the only USB device connected!"
+setup_gcode_shell_command(){
+  echo
+  top_border
+  echo -e "| You are about to install the G-Code Shell Command     |"
+  echo -e "| extension. Please make sure to read the instructions  |"
+  echo -e "| before you continue and remember that potential risks |"
+  echo -e "| can be involved after installing this extension!      |"
+  blank_line
+  echo -e "| ${red}You accept that you are doing this on your own risk!${default}  |"
+  bottom_border
   while true; do
-    echo -e "${cyan}"
-    read -p "###### Press any key to continue ... " yn
-    echo -e "${default}"
-    case "$yn" in
-      *) break;;
-    esac
-  done
-  status_msg "Identifying the correct USB port ..."
-  USB_ID=$(ls /dev/serial/by-id/*)
-  if [ -e /dev/serial/by-id/* ]; then
-    status_msg "The ID of your printer is:"
-    title_msg "$USB_ID"
-  else
-    warn_msg "Could not retrieve ID!"
-    return 1
-  fi
-}
-
-write_printer_id(){
-  while true; do
-    echo -e "${cyan}"
-    read -p "###### Do you want to write the ID to your printer.cfg? (Y/n): " yn
-    echo -e "${default}"
+    read -p "${cyan}###### Do you want to continue? (Y/n):${default} " yn
     case "$yn" in
       Y|y|Yes|yes|"")
-        backup_printer_cfg
-cat <<PRINTERID >> $PRINTER_CFG
-
-##########################
-### CREATED WITH KIAUH ###
-##########################
-[mcu]
-serial: $USB_ID
-##########################
-##########################
-PRINTERID
-        ok_msg "Config written!"
+        if [ -d $KLIPPER_DIR/klippy/extras ]; then
+          status_msg "Installing gcode shell command extension ..."
+          status_msg "Copy gcode_shell_command.py to '$KLIPPER_DIR/klippy/extras' ..."
+          if [ -f $KLIPPER_DIR/klippy/extras/gcode_shell_command.py ]; then
+            warn_msg "There is already a file named 'gcode_shell_command.py'"
+            warn_msg "in the destination location!"
+            while true; do
+              read -p "${cyan}###### Do you want to overwrite it? (Y/n):${default} " yn
+              case "$yn" in
+                Y|y|Yes|yes|"")
+                  rm -f $KLIPPER_DIR/klippy/extras/gcode_shell_command.py
+                  install_gcode_shell_command
+                  break;;
+                N|n|No|no)
+                  break;;
+              esac
+            done
+          else
+            install_gcode_shell_command
+          fi
+        else
+          ERROR_MSG="Folder ~/klipper/klippy/extras not found!"
+        fi
         break;;
-      N|n|No|no) break;;
+      N|n|No|no)
+        break;;
+      *)
+        print_unkown_cmd
+        print_msg && clear_msg;;
     esac
   done
 }
 
-flash_routine(){
-  echo -e "/=================================================\ "
-  echo -e "|                   ATTENTION!                    |"
-  echo -e "| Flashing a Smoothie based board for the first   |"
-  echo -e "| time with this script will certainly fail.      |"
-  echo -e "| This applies to boards like the BTT SKR V1.3 or |"
-  echo -e "| the newer SKR V1.4 (Turbo). You have to copy    |"
-  echo -e "| the firmware file to the microSD card manually  |"
-  echo -e "| and rename it to 'firmware.bin'.                |"
-  echo -e "|                                                 |"
-  echo -e "| You find the file in: ~/klipper/out/klipper.bin |"
-  echo -e "\=================================================/ "
+install_gcode_shell_command(){
+  stop_klipper
+  status_msg "Copy 'gcode_shell_command.py' to $KLIPPER_DIR/klippy/extras"
+  cp ${HOME}/kiauh/resources/gcode_shell_command.py $KLIPPER_DIR/klippy/extras
   echo
   while true; do
-    echo -e "${cyan}"
-    read -p "###### Do you want to continue? (Y/n): " yn
-    echo -e "${default}"
+    read -p "${cyan}###### Do you want to create the example shell command? (Y/n):${default} " yn
     case "$yn" in
       Y|y|Yes|yes|"")
-      get_usb_id && flash_mcu && write_printer_id; break;;
-      N|n|No|no) break;;
+        ADD_SHELL_CMD_MACRO="true"
+        status_msg "Creating example macro ..."
+        locate_printer_cfg
+        read_printer_cfg "gcode_shell_command"
+        write_printer_cfg
+        ok_msg "Example macro created!"
+        break;;
+      N|n|No|no)
+        break;;
     esac
   done
+  ok_msg "Shell command extension installed!"
+  restart_klipper
 }
 
-flash_mcu(){
-  stop_klipper
-  if ! make flash FLASH_DEVICE="$USB_ID" ; then
-    warn_msg "Flashing failed!"
-    warn_msg "Please read the log above!"
-  else
-    ok_msg "Flashing successfull!"
+create_minimal_cfg(){
+  #create a minimal default config
+  if [ "$SEL_DEF_CFG" = "true" ]; then
+		cat <<- EOF >> $PRINTER_CFG
+		[mcu]
+		serial: </dev/serial/by-id/your-mcu>
+
+		[printer]
+		kinematics: none
+		max_velocity: 1
+		max_accel: 1
+
+		[virtual_sdcard]
+		path: ~/sdcard
+
+		[pause_resume]
+		[display_status]
+EOF
   fi
-  start_klipper
-}
+}
+
+read_printer_cfg(){
+  KIAUH_CFG="$(dirname $PRINTER_CFG)/kiauh.cfg"
+  [ ! -f $KIAUH_CFG ] && KIAUH_CFG_FOUND="false" || KIAUH_CFG_FOUND="true"
+  if [ -f $PRINTER_CFG ]; then
+    if [ "$1" = "moonraker" ]; then
+      [ ! "$(grep '^\[virtual_sdcard\]$' $PRINTER_CFG)" ] && VSD="false" && EDIT_CFG="true"
+      [ ! "$(grep '^\[pause_resume\]$' $PRINTER_CFG)" ] && PAUSE_RESUME="false" && EDIT_CFG="true"
+      [ ! "$(grep '^\[display_status\]$' $PRINTER_CFG)" ] && DISPLAY_STATUS="false" && EDIT_CFG="true"
+    elif [ "$1" = "mainsail" ] || [ "$1" = "fluidd" ]; then
+      [ ! "$(grep '^\[include webui_macros\.cfg\]$' $PRINTER_CFG)" ] && WEBUI_MACROS="false" && EDIT_CFG="true"
+    elif [ "$1" = "dwc2" ]; then
+      [ ! "$(grep '^\[virtual_sdcard\]$' $PRINTER_CFG)" ] && VSD="false" && EDIT_CFG="true"
+    fi
+  fi
+}
+
+write_printer_cfg(){
+  #backup printer.cfg if edits will be written
+  [ "$EDIT_CFG" = "true" ] && backup_printer_cfg
+  #create kiauh.cfg if its needed and doesn't exist
+  if [ "$KIAUH_CFG_FOUND" = "false" ] && [ "$EDIT_CFG" = "true" ]; then
+    status_msg "Creating kiauh.cfg ..."
+    echo -e "##### AUTOCREATED BY KIAUH #####" > $KIAUH_CFG
+  fi
+  #write each entry to kiauh.cfg if it doesn't exist
+  #Moonraker/DWC2 related config options
+  if [ "$VSD" = "false" ] && [[ ! $(grep '^\[virtual_sdcard\]$' $KIAUH_CFG) ]]; then
+    echo -e "\n[virtual_sdcard]\npath: ~/sdcard" >> $KIAUH_CFG
+  fi
+  if [ "$PAUSE_RESUME" = "false" ] && [[ ! $(grep '^\[pause_resume]$' $KIAUH_CFG) ]]; then
+    echo -e "\n[pause_resume]" >> $KIAUH_CFG
+  fi
+  if [ "$DISPLAY_STATUS" = "false" ] && [[ ! $(grep '^\[display_status]$' $KIAUH_CFG) ]]; then
+    echo -e "\n[display_status]" >> $KIAUH_CFG
+  fi
+  #Klipper webui related config options
+  if [ "$WEBUI_MACROS" = "false" ] && [ "$ADD_WEBUI_MACROS" = "true" ] && [[ ! $(grep '^\[include webui_macros.cfg]$' $KIAUH_CFG) ]]; then
+    echo -e "\n[include webui_macros.cfg]" >> $KIAUH_CFG
+  fi
+  #G-Code Shell Command extension related config options
+  if [ "$ADD_SHELL_CMD_MACRO" = "true" ] && [[ ! $(grep '^\[gcode_shell_command hello_world]$' $KIAUH_CFG) ]]; then
+		cat <<-EOF >> $KIAUH_CFG
+		[gcode_shell_command hello_world]
+		command: echo hello world
+		timeout: 2.
+		verbose: True
+		[gcode_macro HELLO_WORLD]
+		gcode:
+		    RUN_SHELL_COMMAND CMD=hello_world
+EOF
+  fi
+  #including the kiauh.cfg into printer.cfg if not already done
+  if [ ! "$(grep '^\[include kiauh\.cfg\]$' $PRINTER_CFG)" ] && [ "$EDIT_CFG" = "true" ]; then
+    status_msg "Writing [include kiauh.cfg] to printer.cfg ..."
+    sed -i '1 i ##### AUTOCREATED BY KIAUH #####\n[include kiauh.cfg]' $PRINTER_CFG
+  fi
+  ok_msg "Done!"
+}
+
+init_ini(){
+  if [ ! -f $INI_FILE ]; then
+    echo -e "#don't edit this file if you don't know what you are doing...\c" > $INI_FILE
+  fi
+  if [ ! $(grep -E "^backup_before_update=." $INI_FILE) ]; then
+    echo -e "\nbackup_before_update=false\c" >> $INI_FILE
+  fi
+  if [ ! $(grep -E "^previous_origin_state=[[:alnum:]]" $INI_FILE) ]; then
+    echo -e "\nprevious_origin_state=0\c" >> $INI_FILE
+  fi
+  if [ ! $(grep -E "^previous_smoothing_state=[[:alnum:]]" $INI_FILE) ]; then
+    echo -e "\nprevious_smoothing_state=0\c" >> $INI_FILE
+  fi
+  if [ ! $(grep -E "^previous_shaping_state=[[:alnum:]]" $INI_FILE) ]; then
+    echo -e "\nprevious_shaping_state=0\c" >> $INI_FILE
+  fi
+  if [ ! $(grep -E "^logupload_accepted=." $INI_FILE) ]; then
+    echo -e "\nlogupload_accepted=false\c" >> $INI_FILE
+  fi
+}

scripts/install_dwc2.sh

@@ -1,166 +1,278 @@
-#TODO:
-# - check for existing/running octoprint service
-# - ask for permission to disable octoprint service
-
-dwc2_install_routine(){
+install_dwc2(){
   if [ -d $KLIPPER_DIR ]; then
-    # check for existing installation
-    if [ -d ${HOME}/klippy-env/lib/python2.7/site-packages/tornado ]; then
-      ERROR_MSG=" Looks like DWC2 is already installed!\n Skipping..."
-      return
-    fi
+    system_check_dwc2
+    #check for other enabled web interfaces
+    unset SET_LISTEN_PORT
+    detect_enabled_sites
+    #ask user for customization
+    get_user_selections_dwc2
+    #dwc2 main installation
     stop_klipper
-    install_tornado
-    install_dwc2fk && dwc2fk_cfg
-    install_dwc2
-    start_klipper
+    dwc2_setup
+    #setup config
+    setup_printer_config_dwc2
+    #execute customizations
+    disable_octoprint
+    set_nginx_cfg "dwc2"
+    set_hostname
+    #after install actions
+    restart_klipper
   else
     ERROR_MSG=" Please install Klipper first!\n Skipping..."
   fi
 }
 
-install_tornado(){
-  #check for dependencies
-  dep=(virtualenv)
-  dep_check
-  #execute operation
-  status_msg "Installing Tornado 5.1.1 ..."
-  cd ${HOME}
-  PYTHONDIR="${HOME}/klippy-env"
-  virtualenv ${PYTHONDIR}
-  ${PYTHONDIR}/bin/pip install tornado==5.1.1 && ok_msg "Tornado 5.1.1 successfully installed!"
-}
-
-install_dwc2fk(){
-  cd ${HOME}
-  status_msg "Cloning dwc2-for-klipper repository ..."
-  git clone $DWC2FK_REPO && ok_msg "dwc2-for-klipper successfully cloned!"
-  #create a web_dwc2.py symlink if not already existing
-  if [ -d $KLIPPER_DIR/klippy/extras ] && [ ! -e $KLIPPER_DIR/klippy/extras/web_dwc2.py ]; then
-    status_msg "Creating web_dwc2.py symlink ..."
-    ln -s $DWC2FK_DIR/web_dwc2.py $KLIPPER_DIR/klippy/extras/web_dwc2.py && ok_msg "Symlink created!"
+system_check_dwc2(){
+  status_msg "Initializing DWC2 installation ..."
+  #check for existing printer.cfg
+  locate_printer_cfg
+  if [ -f $PRINTER_CFG ]; then
+    PRINTER_CFG_FOUND="true"
+  else
+    PRINTER_CFG_FOUND="false"
+  fi
+  #check if octoprint is installed
+  if systemctl is-enabled octoprint.service -q 2>/dev/null; then
+    OCTOPRINT_ENABLED="true"
   fi
 }
 
-dwc2fk_cfg(){
+get_user_selections_dwc2(){
+  #let user choose to install systemd or init.d service
   while true; do
-    echo -e "${cyan}"
-    read -p "###### Do you want to create the config now? (Y/n): " yn
-    echo -e "${default}"
-    case "$yn" in
-    Y|y|Yes|yes|"") create_dwc2fk_cfg; break;;
-    N|n|No|no) break;;
-    *) echo "Unknown parameter: $yn"; dwc2fk_cfg;;
+    echo
+    top_border
+    echo -e "| Do you want to install dwc2-for-klipper-socket as     |"
+    echo -e "| 1) Init.d Service (default)                           |"
+    echo -e "| 2) Systemd Service                                    |"
+    hr
+    echo -e "| Please use the appropriate option for your chosen     |"
+    echo -e "| Linux distribution. If you are unsure what to select, |"
+    echo -e "| please do a research before.                          |"
+    hr
+    echo -e "| If you run Raspberry Pi OS, both options will work.   |"
+    bottom_border
+    read -p "${cyan}###### Please choose:${default} " action
+    case "$action" in
+      1|"")
+        echo -e "###### > 1) Init.d"
+        INST_DWC2_INITD="true"
+        INST_DWC2_SYSTEMD="false"
+        break;;
+      2)
+        echo -e "###### > 1) Systemd"
+        INST_DWC2_INITD="false"
+        INST_DWC2_SYSTEMD="true"
+        break;;
+      *)
+        print_unkown_cmd
+        print_msg && clear_msg;;
     esac
   done
+  #user selection for printer.cfg
+  if [ "$PRINTER_CFG_FOUND" = "false" ]; then
+    while true; do
+      echo
+      top_border
+      echo -e "|         ${red}WARNING! - No printer.cfg was found!${default}          |"
+      hr
+      echo -e "|  KIAUH can create a minimal printer.cfg with only the |"
+      echo -e "|  necessary config entries if you wish.                |"
+      echo -e "|                                                       |"
+      echo -e "|  Please be aware, that this option will ${red}NOT${default} create a  |"
+      echo -e "|  fully working printer.cfg for you!                   |"
+      bottom_border
+      read -p "${cyan}###### Create a default printer.cfg? (Y/n):${default} " yn
+      case "$yn" in
+        Y|y|Yes|yes|"")
+          echo -e "###### > Yes"
+          SEL_DEF_CFG="true"
+          break;;
+        N|n|No|no)
+          echo -e "###### > No"
+          SEL_DEF_CFG="false"
+          break;;
+        *)
+          print_unkown_cmd
+          print_msg && clear_msg;;
+      esac
+    done
+  fi
+  #ask user to install reverse proxy
+  dwc2_reverse_proxy_dialog
+  #ask to change hostname
+  [ "$SET_NGINX_CFG" = "true" ] && create_custom_hostname
+  #ask user to disable octoprint when such installed service was found
+  if [ "$OCTOPRINT_ENABLED" = "true" ]; then
+    while true; do
+      echo
+      warn_msg "OctoPrint service found!"
+      echo -e "You might consider disabling the OctoPrint service,"
+      echo -e "since an active OctoPrint service may lead to unexpected"
+      echo -e "behavior of the DWC2 Webinterface."
+      read -p "${cyan}###### Do you want to disable OctoPrint now? (Y/n):${default} " yn
+      case "$yn" in
+        Y|y|Yes|yes|"")
+          echo -e "###### > Yes"
+          DISABLE_OPRINT="true"
+          break;;
+        N|n|No|no)
+          echo -e "###### > No"
+          DISABLE_OPRINT="false"
+          break;;
+        *)
+          print_unkown_cmd
+          print_msg && clear_msg;;
+      esac
+    done
+  fi
+  status_msg "Installation will start now! Please wait ..."
 }
 
-create_dwc2fk_cfg(){
-  echo -e "/=================================================\ "
-  echo -e "|  1) [Default configuration]                     | "
-  echo -e "|  2) [Custom configuration]                      | "
-  echo -e "|  3) [Skip]                                      | "
-  echo -e "\=================================================/ "
-  while true; do
-    read -p "Please select: " choice; echo
-    case "$choice" in
-    1) dwc2fk_default_cfg && ok_msg "Config written ..."; break;;
-    2) create_dwc2fk_custom_cfg && ok_msg "Config written ..."; break;;
-    3) echo "Skipping ..."; break;;
-    esac
-  done
+#############################################################
+#############################################################
+
+get_dwc2_ver(){
+  DWC2_VERSION=$(curl -s https://api.github.com/repositories/28820678/releases/latest | grep tag_name | cut -d'"' -f4)
 }
 
-dwc2fk_default_cfg(){
-  cat <<DWC2 >> $PRINTER_CFG
-
-##########################
-### CREATED WITH KIAUH ###
-##########################
-[virtual_sdcard]
-path: ~/sdcard
-
-[web_dwc2]
-printer_name: my_printer
-listen_adress: 0.0.0.0
-listen_port: 4750
-web_path: dwc2/web
-##########################
-##########################
-DWC2
+dwc2_setup(){
+  #check dependencies
+  dep=(git wget gzip tar curl)
+  dependency_check
+  #get dwc2-for-klipper
+  status_msg "Cloning DWC2-for-Klipper-Socket repository ..."
+  cd ${HOME} && git clone $DWC2FK_REPO
+  ok_msg "DWC2-for-Klipper successfully cloned!"
+  #copy installers from kiauh srcdir to dwc-for-klipper-socket
+  status_msg "Copy installers to $DWC2FK_DIR"
+  cp -r ${SRCDIR}/kiauh/scripts/dwc2-for-klipper-socket-installer $DWC2FK_DIR/scripts
+  ok_msg "Done!"
+  status_msg "Starting service-installer ..."
+  if [ "$INST_DWC2_INITD" = "true" ]; then
+    $DWC2FK_DIR/scripts/install-octopi.sh
+  elif [ "$INST_DWC2_SYSTEMD" = "true" ]; then
+    $DWC2FK_DIR/scripts/install-debian.sh
+  fi
+  ok_msg "Service installed!"
+  #patch /etc/default/klipper to append the uds argument
+  patch_klipper_sysfile "dwc2"
+  #download Duet Web Control
+  download_dwc2_webui
 }
 
-create_dwc2fk_custom_cfg(){
-  echo -e "${cyan}"
-  read -e -p "Printer name: " -i "my_printer" PRINTER_NAME
-  read -e -p "Listen adress: " -i "0.0.0.0" LISTEN_ADRESS
-  read -e -p "Listen port: " -i "4750" LISTEN_PORT
-  read -e -p "Web path: " -i "dwc2/web" WEB_PATH
-  echo -e "${default}"
-  DWC2_CFG=$(cat <<DWC2
-
-##########################
-### CREATED WITH KIAUH ###
-##########################
-[virtual_sdcard]
-path: ~/sdcard
-
-[web_dwc2]
-printer_name: $PRINTER_NAME
-listen_adress: $LISTEN_ADRESS
-listen_port: $LISTEN_PORT
-web_path: $WEB_PATH
-##########################
-##########################
-DWC2
-)
-  echo "The following lines will be written:"
-  echo -e "$DWC2_CFG"
-  while true; do
-    echo -e "${cyan}"
-    read -p "###### Write now (Y) or start over (n)? (Y/n): " yn
-    echo -e "${default}"
-    case "$yn" in
-      Y|y|Yes|yes|"") echo -e "$DWC2_CFG" >> $PRINTER_CFG; break;;
-      N|n|No|no) create_dwc2fk_custom_cfg;;
-    esac
-  done
-}
-
-install_dwc2(){
-  #needed packages for webcam
-  while true; do
-    echo -e "${cyan}"
-    read -p "###### Do you want to use a webcam? (Y/n): " yn
-    echo -e "${default}"
-    case "$yn" in
-      Y|y|Yes|yes|"")
-      status_msg "Checking for dependencies ..."
-      webcam_dep_check && ok_msg "Dependencies installed!"
-      break;;
-      N|n|No|no) break;;
-         *) echo "Unknown parameter: $yn"; echo;;
-    esac
-  done
-  #the update_dwc2 function does the same as installing dwc2
-  update_dwc2 && ok_msg "DWC2 Web UI installed!"
-}
-
-webcam_dep_check(){
-  webcam_dep=(
-  build-essential
-  libjpeg8-dev
-  imagemagick
-  libv4l-dev
-  cmake
-  )
-  for pkg in "${webcam_dep[@]}"
+download_dwc2_webui(){
+  #get Duet Web Control
+  GET_DWC2_URL=$(curl -s https://api.github.com/repositories/28820678/releases/latest | grep browser_download_url | cut -d'"' -f4)
+  status_msg "Downloading DWC2 Web UI ..."
+  [ ! -d $DWC2_DIR ] && mkdir -p $DWC2_DIR
+  cd $DWC2_DIR && wget $GET_DWC2_URL
+  ok_msg "Download complete!"
+  status_msg "Unzipping archive ..."
+  unzip -q -o *.zip
+  for f_ in $(find . | grep '.gz')
   do
-    if ! [[ $(dpkg-query -f'${Status}' --show $pkg 2>/dev/null) = *\ installed ]]; then
-      install+=($pkg)
-    fi
+    gunzip -f ${f_}
   done
-  if ! [ ${#install[@]} -eq 0 ]; then
-    sudo apt-get install ${install[@]} -y
+  ok_msg "Done!"
+  status_msg "Writing DWC version to file ..."
+  echo $GET_DWC2_URL | cut -d/ -f8 > $DWC2_DIR/version
+  ok_msg "Done!"
+  status_msg "Do a little cleanup ..."
+  rm -rf DuetWebControl-SD.zip
+  ok_msg "Done!"
+  ok_msg "DWC2 Web UI installed!"
+}
+
+#############################################################
+#############################################################
+
+setup_printer_config_dwc2(){
+  if [ "$PRINTER_CFG_FOUND" = "true" ]; then
+    #check printer.cfg for necessary dwc2 entries
+    read_printer_cfg "dwc2" && write_printer_cfg
+  fi
+  if [ "$SEL_DEF_CFG" = "true" ]; then
+    status_msg "Creating minimal default printer.cfg ..."
+    create_minimal_cfg
+    ok_msg "printer.cfg location: '$PRINTER_CFG'"
+    ok_msg "Done!"
+  fi
+}
+
+#############################################################
+#############################################################
+
+dwc2_reverse_proxy_dialog(){
+  echo
+  top_border
+  echo -e "|  If you want to have a nicer URL or simply need/want  | "
+  echo -e "|  DWC2 to run on port 80 (http's default port) you     | "
+  echo -e "|  can set up a reverse proxy to run DWC2 on port 80.   | "
+  bottom_border
+  while true; do
+    read -p "${cyan}###### Do you want to set up a reverse proxy now? (y/N):${default} " yn
+    case "$yn" in
+      Y|y|Yes|yes)
+        dwc2_port_check
+        break;;
+      N|n|No|no|"")
+        break;;
+      *)
+        print_unkown_cmd
+        print_msg && clear_msg;;
+    esac
+  done
+}
+
+dwc2_port_check(){
+  if [ "$DWC2_ENABLED" = "false" ]; then
+    if [ "$SITE_ENABLED" = "true" ]; then
+      status_msg "Detected other enabled interfaces:"
+      [ "$OCTOPRINT_ENABLED" = "true" ] && echo "   ${cyan}● OctoPrint - Port:$OCTOPRINT_PORT${default}"
+      [ "$MAINSAIL_ENABLED" = "true" ] && echo "   ${cyan}● Mainsail - Port:$MAINSAIL_PORT${default}"
+      [ "$FLUIDD_ENABLED" = "true" ] && echo "   ${cyan}● Fluidd - Port:$FLUIDD_PORT${default}"
+      if [ "$MAINSAIL_PORT" = "80" ] || [ "$OCTOPRINT_PORT" = "80" ] || [ "$FLUIDD_PORT" = "80" ]; then
+        PORT_80_BLOCKED="true"
+        select_dwc2_port
+      fi
+    else
+      DEFAULT_PORT=$(grep listen ${SRCDIR}/kiauh/resources/dwc2_nginx.cfg | head -1 | sed 's/^\s*//' | cut -d" " -f2 | cut -d";" -f1)
+      SET_LISTEN_PORT=$DEFAULT_PORT
+    fi
+    SET_NGINX_CFG="true"
+  else
+    SET_NGINX_CFG="false"
+  fi
+}
+
+select_dwc2_port(){
+  if [ "$PORT_80_BLOCKED" = "true" ]; then
+    echo
+    top_border
+    echo -e "|                    ${red}!!!WARNING!!!${default}                      |"
+    echo -e "| ${red}You need to choose a different port for DWC2!${default}         |"
+    echo -e "| ${red}The following web interface is listening at port 80:${default}  |"
+    blank_line
+    [ "$OCTOPRINT_PORT" = "80" ] && echo "|  ● OctoPrint                                          |"
+    [ "$MAINSAIL_PORT" = "80" ] && echo "|  ● Mainsail                                           |"
+    [ "$FLUIDD_PORT" = "80" ] && echo "|  ● Fluidd                                             |"
+    blank_line
+    echo -e "| Make sure you don't choose a port which was already   |"
+    echo -e "| assigned to one of the other web interfaces!          |"
+    blank_line
+    echo -e "| Be aware: there is ${red}NO${default} sanity check for the following  |"
+    echo -e "| input. So make sure to choose a valid port!           |"
+    bottom_border
+    while true; do
+      read -p "${cyan}Please enter a new Port:${default} " NEW_PORT
+      if [ "$NEW_PORT" != "$MAINSAIL_PORT" ] && [ "$NEW_PORT" != "$FLUIDD_PORT" ] && [ "$NEW_PORT" != "$OCTOPRINT_PORT" ]; then
+        echo "Setting port $NEW_PORT for DWC2!"
+        SET_LISTEN_PORT=$NEW_PORT
+        break
+      else
+        echo "That port is already taken! Select a different one!"
+      fi
+    done
   fi
 }

scripts/install_klipper.sh

@@ -1,30 +1,248 @@
 install_klipper(){
-  if [ -e /etc/init.d/klipper ] && [ -e /etc/default/klipper ]; then
-    ERROR_MSG=" Looks like klipper is already installed!\n Skipping ..."
+  if [ -e $KLIPPER_SERVICE1 ] && [ -e $KLIPPER_SERVICE2 ] || [ -e $KLIPPER_SERVICE3 ]; then
+    ERROR_MSG="Looks like Klipper is already installed!"
   else
-    #check for dependencies
-    dep=(git)
-    dep_check
-    #execute operation
-    cd ${HOME}
-    status_msg "Cloning klipper repository ..."
-    git clone $KLIPPER_REPO && ok_msg "Klipper successfully cloned!"
-    status_msg "Installing klipper service ..."
-    $KLIPPER_DIR/scripts/install-octopi.sh && sleep 2 && ok_msg "Klipper installation complete!"
-    #create a klippy.log symlink in home-dir just for convenience
-    if [ ! -e ${HOME}/klippy.log ]; then
-      status_msg "Creating klippy.log symlink ..."
-      ln -s /tmp/klippy.log ${HOME}/klippy.log && ok_msg "Symlink created!"
-    fi
-    while true; do
-      echo -e "${cyan}"
-      read -p "###### Do you want to flash your MCU now? (Y/n): " yn
-      echo -e "${default}"
-      case "$yn" in
-        Y|y|Yes|yes|"") build_fw && flash_routine; break;;
-        N|n|No|no) break;;
-      *) warn_msg "Unknown parameter: $yn"; echo;;
+    get_user_selections_klipper
+    klipper_setup
+    build_fw
+    flash_mcu
+    write_printer_usb
+  fi
+}
+
+get_user_selections_klipper(){
+  status_msg "Initializing Klipper installation ..."
+  #let user choose to install systemd or init.d service
+  while true; do
+    echo
+    top_border
+    echo -e "| Do you want to install Klipper as:                    |"
+    echo -e "| 1) Init.d Service (default)                           |"
+    echo -e "| 2) Systemd Service                                    |"
+    hr
+    echo -e "| Please use the appropriate option for your chosen     |"
+    echo -e "| Linux distribution. If you are unsure what to select, |"
+    echo -e "| please do some research before.                       |"
+    hr
+    echo -e "| If you run Raspberry Pi OS, both options will work.   |"
+    bottom_border
+    read -p "${cyan}###### Please choose:${default} " action
+    case "$action" in
+      1|"")
+        echo -e "###### > 1) Init.d"
+        INST_KLIPPER_INITD="true"
+        INST_KLIPPER_SYSTEMD="false"
+        break;;
+      2)
+        echo -e "###### > 2) Systemd"
+        INST_KLIPPER_INITD="false"
+        INST_KLIPPER_SYSTEMD="true"
+        break;;
+      *)
+        print_unkown_cmd
+        print_msg && clear_msg;;
     esac
   done
+  #ask user for building firmware
+  while true; do
+      echo
+      read -p "${cyan}###### Do you want to build the Firmware? (y/N):${default} " yn
+      case "$yn" in
+        Y|y|Yes|yes)
+          echo -e "###### > Yes"
+          BUILD_FIRMWARE="true"
+          break;;
+        N|n|No|no|"")
+          echo -e "###### > No"
+          BUILD_FIRMWARE="false"
+          break;;
+        *)
+          print_unkown_cmd
+          print_msg && clear_msg;;
+    esac
+  done
+  #ask user for flashing mcu
+  while true; do
+      echo
+      read -p "${cyan}###### Do you want to flash your MCU? (y/N):${default} " yn
+      case "$yn" in
+        Y|y|Yes|yes)
+          echo -e "###### > Yes"
+          FLASH_FIRMWARE="true"
+          flash_routine
+          break;;
+        N|n|No|no|"")
+          echo -e "###### > No"
+          FLASH_FIRMWARE="false"
+          break;;
+        *)
+          print_unkown_cmd
+          print_msg && clear_msg;;
+    esac
+  done
+}
+
+klipper_setup(){
+  #check for dependencies
+  dep=(git dbus)
+  dependency_check
+  #execute operation
+  cd ${HOME}
+  status_msg "Cloning Klipper repository ..."
+  git clone $KLIPPER_REPO
+  ok_msg "Klipper successfully cloned!"
+  status_msg "Installing Klipper Service ..."
+  if [ "$INST_KLIPPER_INITD" = "true" ]; then
+    $KLIPPER_DIR/scripts/install-octopi.sh
+  elif [ "$INST_KLIPPER_SYSTEMD" = "true" ]; then
+    $KLIPPER_DIR/scripts/install-debian.sh
+  fi
+  ok_msg "Klipper installation complete!"
+}
+
+flash_routine(){
+  if [ "$FLASH_FIRMWARE" = "true" ]; then
+    echo
+    top_border
+    echo -e "|        ${red}~~~~~~~~~~~ [ ATTENTION! ] ~~~~~~~~~~~~${default}        |"
+    hr
+    echo -e "| Flashing a Smoothie based board with this script will |"
+    echo -e "| certainly fail. This applies to boards like the BTT   |"
+    echo -e "| SKR V1.3 or SKR V1.4(Turbo). You have to copy the     |"
+    echo -e "| firmware file to the microSD card manually and rename |"
+    echo -e "| it to 'firmware.bin'.                                 |"
+    hr
+    echo -e "| You can find the file in: ~/klipper/out/klipper.bin   |"
+    bottom_border
+    while true; do
+      read -p "${cyan}###### Do you want to continue? (Y/n):${default} " yn
+      case "$yn" in
+        Y|y|Yes|yes|"")
+          echo -e "###### > Yes"
+          CONFIRM_FLASHING="true"
+          CONFIRM_WRITE_PRINTER_USB="true"
+          get_printer_usb
+          break;;
+        N|n|No|no)
+          echo -e "###### > No"
+          CONFIRM_FLASHING="false"
+          CONFIRM_WRITE_PRINTER_USB="false"
+          break;;
+        *)
+          print_unkown_cmd
+          print_msg && clear_msg;;
+      esac
+    done
+  fi
+}
+
+flash_mcu(){
+  if [ "$CONFIRM_FLASHING" = "true" ] && [ ! -z "$PRINTER_USB" ]; then
+    stop_klipper
+    if ! make flash FLASH_DEVICE="$PRINTER_USB" ; then
+      warn_msg "Flashing failed!"
+      warn_msg "Please read the console output above!"
+    else
+      ok_msg "Flashing successfull!"
+    fi
+    start_klipper
+  fi
+}
+
+build_fw(){
+  if [ "$BUILD_FIRMWARE" = "true" ]; then
+    if [ -d $KLIPPER_DIR ]; then
+      cd $KLIPPER_DIR
+      status_msg "Initializing Firmware Setup ..."
+      make menuconfig
+      status_msg "Building Firmware ..."
+      make clean && make && ok_msg "Firmware built!"
+    else
+      warn_msg "Can not build Firmware without a Klipper directory!"
+    fi
+  fi
+}
+
+### grab the printers id
+get_printer_usb(){
+  echo
+  top_border
+  echo -e "| Please make sure your printer is connected to the Pi! |"
+  echo -e "| If the printer is not connected yet, connect it now.  |"
+  hr
+  echo -e "| Also make sure, that it is the only USB device        |"
+  echo -e "| connected at for now! Otherwise this step may fail!   |"
+  bottom_border
+  while true; do
+    echo -e "${cyan}"
+    read -p "###### Press any key to continue ... " yn
+    echo -e "${default}"
+    case "$yn" in
+      *)
+        CONFIRM_PRINTER_USB="true"
+        break;;
+    esac
+  done
+  status_msg "Identifying the correct USB port ..."
+  sleep 2
+  unset PRINTER_USB
+  if [ -e /dev/serial/by-id/* ]; then
+    if [ -e /dev/serial/by-id/* ]; then
+      PRINTER_USB=$(ls /dev/serial/by-id/*)
+      status_msg "The ID of your printer is:"
+      title_msg "$PRINTER_USB"
+    else
+      warn_msg "Could not retrieve ID!"
+    fi
+  elif [ -e /dev/serial/by-path/* ]; then
+    if [ -e /dev/serial/by-path/* ]; then
+      PRINTER_USB=$(ls /dev/serial/by-path/*)
+      status_msg "The path of your printer is:"
+      title_msg "$PRINTER_USB"
+    else
+      warn_msg "Could not retrieve path!"
+    fi
+  else
+    warn_msg "Printer not plugged in or not detectable!"
+fi
+}
+
+write_printer_usb(){
+  locate_printer_cfg
+  if [ ! -z "$PRINTER_CFG" ] && [ "$CONFIRM_WRITE_PRINTER_USB" = "true" ]; then
+    SERIAL_OLD=$(grep "serial" $PRINTER_CFG | tail -1 | cut -d" " -f2)
+    SERIAL_NEW=$PRINTER_USB
+    if [ "$SERIAL_OLD" != "$SERIAL_NEW" ]; then
+      unset write_entries
+      backup_printer_cfg
+      write_entries+=("[mcu]\nserial: $SERIAL_NEW")
+      write_entries+=("\\\n############################\n##### CREATED BY KIAUH #####\n############################")
+      write_entries=("############################\n" "${write_entries[@]}")
+      #check for a SAVE_CONFIG entry
+      SC="#*# <---------------------- SAVE_CONFIG ---------------------->"
+      if [[ $(grep "$SC" $PRINTER_CFG) ]]; then
+        SC_LINE=$(grep -n "$SC" $PRINTER_CFG | cut -d ":" -f1)
+        PRE_SC_LINE=$(expr $SC_LINE - 1)
+        SC_ENTRY="true"
+      else
+        SC_ENTRY="false"
+      fi
+      status_msg "Writing printer ID/path to printer.cfg ..."
+      if [ "$SC_ENTRY" = "true" ]; then
+        PRE_SC_LINE="$(expr $SC_LINE - 1)a"
+        for entry in "${write_entries[@]}"
+        do
+          sed -i "$PRE_SC_LINE $entry" $PRINTER_CFG
+        done
+      fi
+      if [ "$SC_ENTRY" = "false" ]; then
+        LINE_COUNT="$(wc -l < $PRINTER_CFG)a"
+        for entry in "${write_entries[@]}"
+        do
+          sed -i "$LINE_COUNT $entry" $PRINTER_CFG
+        done
+      fi
+      ok_msg "Done!"
+    fi
   fi
 }

scripts/install_klipper_webui.sh

@@ -0,0 +1,278 @@
+check_moonraker(){
+  status_msg "Checking for Moonraker service ..."
+  if [ "$(systemctl list-units --full -all -t service --no-legend | grep -F "moonraker.service")" ]; then
+    ok_msg "Moonraker service found!"; echo
+    MOONRAKER_SERVICE_FOUND="true"
+  else
+    warn_msg "Moonraker service not found!"
+    warn_msg "Please install Moonraker first!"; echo
+    MOONRAKER_SERVICE_FOUND="false"
+  fi
+}
+
+get_user_selection_webui(){
+  #ask user for webui default macros
+  while true; do
+    unset ADD_WEBUI_MACROS
+    echo
+    top_border
+    echo -e "| It is recommended to have some important macros to    |"
+    echo -e "| have full functionality of the web interface.         |"
+    blank_line
+    echo -e "| If you do not have such macros, you can choose to     |"
+    echo -e "| install the suggested default macros now.             |"
+    bottom_border
+    read -p "${cyan}###### Add the recommended macros? (Y/n):${default} " yn
+    case "$yn" in
+      Y|y|Yes|yes|"")
+        echo -e "###### > Yes"
+        ADD_WEBUI_MACROS="true"
+        break;;
+      N|n|No|no)
+        echo -e "###### > No"
+        ADD_WEBUI_MACROS="false"
+        break;;
+      *)
+        print_unkown_cmd
+        print_msg && clear_msg;;
+    esac
+  done
+}
+
+install_mainsail(){
+  get_user_selection_webui
+  #check if moonraker is already installed
+  check_moonraker
+  if [ "$MOONRAKER_SERVICE_FOUND" = "true" ]; then
+    #check for other enabled web interfaces
+    unset SET_LISTEN_PORT
+    detect_enabled_sites
+    #check if another site already listens to port 80
+    mainsail_port_check
+    #creating the mainsail nginx cfg
+    set_nginx_cfg "mainsail"
+    #test_nginx "$SET_LISTEN_PORT"
+    locate_printer_cfg && read_printer_cfg "mainsail"
+    install_webui_macros
+    mainsail_setup
+  fi
+}
+
+install_fluidd(){
+  get_user_selection_webui
+  #check if moonraker is already installed
+  check_moonraker
+  if [ "$MOONRAKER_SERVICE_FOUND" = "true" ]; then
+    #check for other enabled web interfaces
+    unset SET_LISTEN_PORT
+    detect_enabled_sites
+    #check if another site already listens to port 80
+    fluidd_port_check
+    #creating the fluidd nginx cfg
+    set_nginx_cfg "fluidd"
+    #test_nginx "$SET_LISTEN_PORT"
+    locate_printer_cfg && read_printer_cfg "fluidd"
+    install_webui_macros
+    fluidd_setup
+  fi
+}
+
+install_webui_macros(){
+  #copy webui_macros.cfg
+  if [ "$ADD_WEBUI_MACROS" = "true" ]; then
+    status_msg "Create webui_macros.cfg ..."
+    if [ ! -f ${HOME}/klipper_config/webui_macros.cfg ]; then
+      cp ${HOME}/kiauh/resources/webui_macros.cfg ${HOME}/klipper_config
+      ok_msg "File created!"
+    else
+      warn_msg "File already exists! Skipping ..."
+    fi
+  fi
+  write_printer_cfg
+}
+
+mainsail_port_check(){
+  if [ "$MAINSAIL_ENABLED" = "false" ]; then
+    if [ "$SITE_ENABLED" = "true" ]; then
+      status_msg "Detected other enabled interfaces:"
+      [ "$OCTOPRINT_ENABLED" = "true" ] && echo -e "   ${cyan}● OctoPrint - Port: $OCTOPRINT_PORT${default}"
+      [ "$FLUIDD_ENABLED" = "true" ] && echo -e "   ${cyan}● Fluidd - Port: $FLUIDD_PORT${default}"
+      [ "$DWC2_ENABLED" = "true" ] && echo -e "   ${cyan}● DWC2 - Port: $DWC2_PORT${default}"
+      if [ "$FLUIDD_PORT" = "80" ] || [ "$DWC2_PORT" = "80" ] || [ "$OCTOPRINT_PORT" = "80" ]; then
+        PORT_80_BLOCKED="true"
+        select_mainsail_port
+      fi
+    else
+      DEFAULT_PORT=$(grep listen ${SRCDIR}/kiauh/resources/mainsail_nginx.cfg | head -1 | sed 's/^\s*//' | cut -d" " -f2 | cut -d";" -f1)
+      SET_LISTEN_PORT=$DEFAULT_PORT
+    fi
+    SET_NGINX_CFG="true"
+  else
+    SET_NGINX_CFG="false"
+  fi
+}
+
+fluidd_port_check(){
+  if [ "$FLUIDD_ENABLED" = "false" ]; then
+    if [ "$SITE_ENABLED" = "true" ]; then
+      status_msg "Detected other enabled interfaces:"
+      [ "$OCTOPRINT_ENABLED" = "true" ] && echo "   ${cyan}● OctoPrint - Port: $OCTOPRINT_PORT${default}"
+      [ "$MAINSAIL_ENABLED" = "true" ] && echo "   ${cyan}● Mainsail - Port: $MAINSAIL_PORT${default}"
+      [ "$DWC2_ENABLED" = "true" ] && echo "   ${cyan}● DWC2 - Port: $DWC2_PORT${default}"
+      if [ "$MAINSAIL_PORT" = "80" ] || [ "$DWC2_PORT" = "80" ] || [ "$OCTOPRINT_PORT" = "80" ]; then
+        PORT_80_BLOCKED="true"
+        select_fluidd_port
+      fi
+    else
+      DEFAULT_PORT=$(grep listen ${SRCDIR}/kiauh/resources/fluidd_nginx.cfg | head -1 | sed 's/^\s*//' | cut -d" " -f2 | cut -d";" -f1)
+      SET_LISTEN_PORT=$DEFAULT_PORT
+    fi
+    SET_NGINX_CFG="true"
+  else
+    SET_NGINX_CFG="false"
+  fi
+}
+
+select_mainsail_port(){
+  if [ "$PORT_80_BLOCKED" = "true" ]; then
+    echo
+    top_border
+    echo -e "|                    ${red}!!!WARNING!!!${default}                      |"
+    echo -e "| ${red}You need to choose a different port for Mainsail!${default}     |"
+    echo -e "| ${red}The following web interface is listening at port 80:${default}  |"
+    blank_line
+    [ "$OCTOPRINT_PORT" = "80" ] && echo "|  ● OctoPrint                                          |"
+    [ "$FLUIDD_PORT" = "80" ] && echo "|  ● Fluidd                                             |"
+    [ "$DWC2_PORT" = "80" ] && echo "|  ● DWC2                                               |"
+    blank_line
+    echo -e "| Make sure you don't choose a port which was already   |"
+    echo -e "| assigned to one of the other web interfaces!          |"
+    blank_line
+    echo -e "| Be aware: there is ${red}NO${default} sanity check for the following  |"
+    echo -e "| input. So make sure to choose a valid port!           |"
+    bottom_border
+    while true; do
+      read -p "${cyan}Please enter a new Port:${default} " NEW_PORT
+      if [ "$NEW_PORT" != "$FLUIDD_PORT" ] && [ "$NEW_PORT" != "$DWC2_PORT" ] && [ "$NEW_PORT" != "$OCTOPRINT_PORT" ]; then
+        echo "Setting port $NEW_PORT for Mainsail!"
+        SET_LISTEN_PORT=$NEW_PORT
+        break
+      else
+        echo "That port is already taken! Select a different one!"
+      fi
+    done
+  fi
+}
+
+select_fluidd_port(){
+  if [ "$PORT_80_BLOCKED" = "true" ]; then
+    echo
+    top_border
+    echo -e "|                    ${red}!!!WARNING!!!${default}                      |"
+    echo -e "| ${red}You need to choose a different port for Fluidd!${default}       |"
+    echo -e "| ${red}The following web interface is listening at port 80:${default}  |"
+    blank_line
+    [ "$OCTOPRINT_PORT" = "80" ] && echo "|  ● OctoPrint                                          |"
+    [ "$MAINSAIL_PORT" = "80" ] && echo "|  ● Mainsail                                           |"
+    [ "$DWC2_PORT" = "80" ] && echo "|  ● DWC2                                               |"
+    blank_line
+    echo -e "| Make sure you don't choose a port which was already   |"
+    echo -e "| assigned to one of the other web interfaces!          |"
+    blank_line
+    echo -e "| Be aware: there is ${red}NO${default} sanity check for the following  |"
+    echo -e "| input. So make sure to choose a valid port!           |"
+    bottom_border
+    while true; do
+      read -p "${cyan}Please enter a new Port:${default} " NEW_PORT
+      if [ "$NEW_PORT" != "$MAINSAIL_PORT" ] && [ "$NEW_PORT" != "$DWC2_PORT" ] && [ "$NEW_PORT" != "$OCTOPRINT_PORT" ]; then
+        echo "Setting port $NEW_PORT for Fluidd!"
+        SET_LISTEN_PORT=$NEW_PORT
+        break
+      else
+        echo "That port is already taken! Select a different one!"
+      fi
+    done
+  fi
+}
+
+get_mainsail_ver(){
+  MAINSAIL_VERSION=$(curl -s https://api.github.com/repositories/240875926/releases | grep tag_name | cut -d'"' -f4 | cut -d"v" -f2 | head -1)
+}
+
+get_fluidd_ver(){
+  FLUIDD_VERSION=$(curl -s https://api.github.com/repositories/295836951/releases | grep tag_name | cut -d'"' -f4 | cut -d"v" -f2 | head -1)
+}
+
+mainsail_setup(){
+  #get mainsail download url
+  MAINSAIL_DL_URL=$(curl -s https://api.github.com/repositories/240875926/releases | grep browser_download_url | cut -d'"' -f4 | head -1)
+  #clean up an existing mainsail folder
+  [ -d $MAINSAIL_DIR ] && rm -rf $MAINSAIL_DIR
+  #create fresh mainsail folder and download mainsail
+  mkdir $MAINSAIL_DIR && cd $MAINSAIL_DIR
+  status_msg "Downloading Mainsail $MAINSAIL_VERSION ..."
+  wget $MAINSAIL_DL_URL && ok_msg "Download complete!"
+  #extract archive
+  status_msg "Extracting archive ..."
+  unzip -q -o *.zip && ok_msg "Done!"
+  #delete downloaded zip
+  status_msg "Remove downloaded archive ..."
+  rm -rf *.zip && ok_msg "Done!" && ok_msg "Mainsail installation complete!"
+  echo
+}
+
+fluidd_setup(){
+  #get fluidd download url
+  FLUIDD_DL_URL=$(curl -s https://api.github.com/repositories/295836951/releases/latest | grep browser_download_url | cut -d'"' -f4)
+  #clean up an existing fluidd folder
+  [ -d $FLUIDD_DIR ] && rm -rf $FLUIDD_DIR
+  #create fresh fluidd folder and download fluidd
+  mkdir $FLUIDD_DIR && cd $FLUIDD_DIR
+  status_msg "Downloading Fluidd $FLUIDD_VERSION ..."
+  wget $FLUIDD_DL_URL && ok_msg "Download complete!"
+  #extract archive
+  status_msg "Extracting archive ..."
+  unzip -q -o *.zip && ok_msg "Done!"
+  #patch moonraker.conf to apply cors domains if needed
+  backup_moonraker_conf
+  patch_moonraker
+  #delete downloaded zip
+  status_msg "Remove downloaded archive ..."
+  rm -rf *.zip && ok_msg "Done!" && ok_msg "Fluidd installation complete!"
+  echo
+}
+
+patch_moonraker(){
+  status_msg "Patching moonraker.conf ..."
+  mr_conf=${HOME}/moonraker.conf
+  # remove the now deprecated enable_cors option from moonraker.conf if it still exists
+  if [ "$(grep "^enable_cors:" $mr_conf)" ]; then
+    line="$(grep -n "^enable_cors:" ~/moonraker.conf | cut -d":" -f1)d"
+    sed -i "$line" $mr_conf && mr_restart="true"
+  fi
+  # looking for a cors_domain entry in moonraker.conf
+  if [ ! "$(grep "^cors_domains:$" $mr_conf)" ]; then
+    #find trusted_clients line number and subtract one, to insert cors_domains later
+    line="$(grep -n "^trusted_clients:$" $mr_conf | cut -d":" -f1)i"
+    sed -i "$line cors_domains:" $mr_conf && mr_restart="true"
+  fi
+  if [ "$(grep "^cors_domains:$" $mr_conf)" ]; then
+    hostname=$(hostname -I | cut -d" " -f1)
+    url1="\ \ \ \ http://*.local"
+    url2="\ \ \ \ http://app.fluidd.xyz"
+    url3="\ \ \ \ https://app.fluidd.xyz"
+    url4="\ \ \ \ http://$hostname:*"
+    #find cors_domains line number and add one, to insert urls later
+    line="$(expr $(grep -n "cors_domains:" $mr_conf | cut -d":" -f1) + 1)i"
+    [ ! "$(grep -E '^\s+http:\/\/\*\.local$' $mr_conf)" ] && sed -i "$line $url1" $mr_conf && mr_restart="true"
+    [ ! "$(grep -E '^\s+http:\/\/app\.fluidd\.xyz$' $mr_conf)" ] && sed -i "$line $url2" $mr_conf && mr_restart="true"
+    [ ! "$(grep -E '^\s+https:\/\/app\.fluidd\.xyz$' $mr_conf)" ] && sed -i "$line $url3" $mr_conf && mr_restart="true"
+    [ ! "$(grep -E '^\s+http:\/\/([0-9]{1,3}\.){3}[0-9]{1,3}' $mr_conf)" ] && sed -i "$line $url4" $mr_conf && mr_restart="true"
+  fi
+  #restart moonraker service if mr_restart was set to true
+  if [[ $mr_restart == "true" ]]; then
+    ok_msg "Patching done!" && restart_moonraker
+  else
+    ok_msg "No patching was needed!"
+  fi
+}

scripts/install_klipperscreen.sh

@@ -0,0 +1,83 @@
+install_klipperscreen(){
+  python3_check
+  if [ $py_chk_ok = "true" ]; then
+    system_check_klipperscreen
+    #ask user for customization
+    get_user_selections_klipperscreen
+    #KlipperScreen main installation
+    klipperscreen_setup
+    #execute customizations
+    symlinks_klipperscreen
+    #after install actions
+    restart_klipperscreen
+  else
+    ERROR_MSG="Python 3.7 or above required!\n Please upgrade your Python version first."
+    print_msg && clear_msg
+  fi
+}
+
+python3_check(){
+  status_msg "Your Python 3 version is: $(python3 --version)"
+  major=$(python3 --version | cut -d" " -f2 | cut -d"." -f1)
+  minor=$(python3 --version | cut -d"." -f2)
+  if [ $major -ge 3 ] && [ $minor -ge 7 ]; then
+    ok_msg "Python version ok!"
+    py_chk_ok="true"
+  else
+    py_chk_ok="false"
+  fi
+}
+
+system_check_klipperscreen(){
+  if [ ! -e ${HOME}/klipper_config/KlipperScreen.log ]; then
+    KLIPPERSCREEN_SL_FOUND="false"
+  else
+    KLIPPERSCREEN_SL_FOUND="true"
+  fi
+}
+
+get_user_selections_klipperscreen(){
+  #user selection for KlipperScreen.log symlink
+  if [ "$KLIPPERSCREEN_SL_FOUND" = "false" ]; then
+    while true; do
+      echo
+      read -p "${cyan}###### Create KlipperScreen.log symlink? (y/N):${default} " yn
+      case "$yn" in
+        Y|y|Yes|yes)
+          echo -e "###### > Yes"
+          SEL_KSLOG_SL="true"
+          break;;
+        N|n|No|no|"")
+          echo -e "###### > No"
+          SEL_KSLOG_SL="false"
+          break;;
+        *)
+          print_unkown_cmd
+          print_msg && clear_msg;;
+      esac
+    done
+  fi
+}
+
+klipperscreen_setup(){
+  dep=(wget curl unzip dfu-util)
+  dependency_check
+  status_msg "Downloading KlipperScreen ..."
+  #force remove existing KlipperScreen dir
+  [ -d $KLIPPERSCREEN_DIR ] && rm -rf $KLIPPERSCREEN_DIR
+  #clone into fresh KlipperScreen dir
+  cd ${HOME} && git clone $KLIPPERSCREEN_REPO
+  ok_msg "Download complete!"
+  status_msg "Installing KlipperScreen ..."
+  $KLIPPERSCREEN_DIR/scripts/KlipperScreen-install.sh
+  echo; ok_msg "KlipperScreen successfully installed!"
+}
+
+symlinks_klipperscreen(){
+  #create a KlipperScreen.log symlink in klipper_config-dir just for convenience
+  if [ "$SEL_KSLOG_SL" = "true" ] && [ ! -e ${HOME}/klipper_config/KlipperScreen.log ]; then
+    status_msg "Creating KlipperScreen.log symlink ..."
+    ln -s /tmp/KlipperScreen.log ${HOME}/klipper_config
+    ok_msg "Symlink created!"
+  fi
+}

scripts/install_mainsail.sh

@@ -1,349 +0,0 @@
-mainsail_install_routine(){
-  if [ -d $KLIPPER_DIR ]; then
-    #check for dependencies
-    dep=(wget curl unzip)
-    dep_check
-    #execute operation
-    install_moonraker
-    disable_wrong_webserver
-    remove_wrong_webserver
-    install_nginx
-    test_api
-    test_nginx
-    install_mainsail && ok_msg "Mainsail install complete!"; echo
-  else
-    ERROR_MSG=" Please install Klipper first!\n Skipping..."
-  fi
-}
-
-install_moonraker(){
-  cd $KLIPPER_DIR
-  if [[ $(git describe --all) = "remotes/Arksine/work-web_server-20200131" ]]; then
-    status_msg "Installing Moonraker ..."
-    $KLIPPER_DIR/scripts/install-moonraker.sh && ok_msg "Moonraker successfully installed!"
-    if [ ! -d ${HOME}/sdcard ]; then
-      mkdir ${HOME}/sdcard
-    fi
-    #create a moonraker.log symlink in home-dir just for convenience
-    if [ ! -e ${HOME}/moonraker.log ]; then
-      status_msg "Creating moonraker.log symlink ..."
-      ln -s /tmp/moonraker.log ${HOME}/moonraker.log && ok_msg "Symlink created!"
-    fi
-  else
-    warn_msg "You are not using Arksine/work-web_server-20200131."
-    warn_msg "Please switch to the moonraker fork first!"
-    while true; do
-      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;;
-           *) echo "Unknown parameter: $yn"; echo;;
-      esac
-    done
-  fi
-}
-
-check_printer_cfg(){
-  if [ ! -e $PRINTER_CFG ]; then
-    warn_msg "No printer.cfg found"
-    while true; do
-      echo -e "${cyan}"
-      read -p "###### Do you want to create a default config? (Y/n): " yn
-      echo -e "${default}"
-      case "$yn" in
-        Y|y|Yes|yes|"") create_default_cfg; break;;
-        N|n|No|no) break;;
-           *) echo "Unknown parameter: $yn"; echo;;
-      esac
-    done
-  else
-    check_vsdcard_section
-    check_api_section
-  fi
-}
-
-disable_wrong_webserver(){
-  if systemctl is-active haproxy ; then
-    status_msg "Stopping haproxy service ..."
-    sudo /etc/init.d/haproxy stop && ok_msg "Service stopped!"
-  fi
-  if systemctl is-active lighttpd ; then
-    status_msg "Stopping lighttpd service ..."
-    sudo /etc/init.d/lighttpd stop && ok_msg "Service stopped!"
-  fi
-}
-
-remove_wrong_webserver(){
-  rem=(haproxy lighttpd)
-  for remove in "${rem[@]}"
-  do
-    if [[ $(dpkg-query -f'${Status}' --show $remove 2>/dev/null) = *\ installed ]]; then
-      delete+=($remove)
-    fi
-  done
-  if ! [ ${#delete[@]} -eq 0 ]; then
-    sudo apt-get remove ${delete[@]} -y
-  fi
-}
-
-install_nginx(){
-  if ! [[ $(dpkg-query -f'${Status}' --show nginx 2>/dev/null) = *\ installed ]]; then
-    status_msg "Installing Nginx ..."
-    sudo apt-get install nginx -y && ok_msg "Nginx successfully installed!"
-  fi
-  if [ ! -d $MAINSAIL_DIR ]; then
-    mkdir $MAINSAIL_DIR
-  fi
-  status_msg "Configure Nginx ..."
-  create_mainsail_cfgfile && sudo mv $MAINSAIL_DIR/mainsail /etc/nginx/sites-available/
-  if [ -e /etc/nginx/sites-enabled/default ]; then
-    sudo rm /etc/nginx/sites-enabled/default
-  fi
-  if [ ! -e /etc/nginx/sites-enabled/mainsail ]; then
-    sudo ln -s /etc/nginx/sites-available/mainsail /etc/nginx/sites-enabled/
-  fi
-  ok_msg "Nginx configured!"
-}
-
-test_api(){
-  status_msg "Testing API ..."
-  sleep 5
-  status_msg "API response from http://localhost:7125/printer/info:"
-  API_RESPONSE="$(curl -sG4 http://localhost:7125/printer/info)"
-  echo -e "${cyan}$API_RESPONSE${default}"
-  if [ $(curl -sG4 "http://localhost:7125/printer/info" | grep '^{"result"' -c) -eq 1 ]; then
-    echo; ok_msg "Klipper API is working correctly!"; echo
-  else
-    echo; warn_msg "Klipper API not working correctly!"; echo
-  fi
-}
-
-test_nginx(){
-  sudo /etc/init.d/nginx restart
-  status_msg "Testing Nginx ..."
-  sleep 5
-  status_msg "API response from http://localhost/printer/info:"
-  API_RESPONSE="$(curl -sG4 http://localhost/printer/info)"
-  echo -e "${cyan}$API_RESPONSE${default}"
-  if [ $(curl -sG4 "http://localhost/printer/info" | grep '^{"result"' -c) -eq 1 ]; then
-    echo; ok_msg "Nginx is working correctly!"; echo
-  else
-    echo; warn_msg "Nginx is not working correctly!"; echo
-  fi
-}
-
-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_dl_url(){
-  get_mainsail_ver
-  MAINSAIL_URL=https://github.com/meteyou/mainsail/releases/download/v"$MAINSAIL_VERSION"/mainsail-alpha-"$MAINSAIL_VERSION".zip
-}
-
-install_mainsail(){
-  mainsail_dl_url
-  if [ ! -d $MAINSAIL_DIR ]; then
-    mkdir $MAINSAIL_DIR
-  fi
-  cd $MAINSAIL_DIR
-  status_msg "Downloading Mainsail v$MAINSAIL_VERSION ..."
-  wget -q -O mainsail.zip $MAINSAIL_URL && status_msg "Extracting archive ..." && unzip -o mainsail.zip && rm mainsail.zip
-  ### write mainsail version to file for update check reasons
-  echo "$MAINSAIL_VERSION" > $MAINSAIL_DIR/version
-}
-
-create_mainsail_cfgfile(){
-  cat <<MAINSAIL_CFG > $MAINSAIL_DIR/mainsail
-map \$http_upgrade \$connection_upgrade {
-    default upgrade;
-    '' close;
-}
-
-upstream apiserver {
-    #edit your api port here
-    ip_hash;
-    server 127.0.0.1:7125;
-}
-
-server {
-    listen 80 default_server;
-    listen [::]:80 default_server;
-
-    access_log /var/log/nginx/mainsail-access.log;
-    error_log /var/log/nginx/mainsail-error.log;
-
-    #web_path from mainsail static files
-    root /home/pi/mainsail;
-
-    index index.html;
-    server_name _;
-
-    #max upload size for gcodes
-    client_max_body_size 200M;
-
-    location / {
-        try_files \$uri \$uri/ /index.html;
-    }
-
-    location /printer {
-        proxy_pass http://apiserver/printer;
-        proxy_set_header Host \$http_host;
-        proxy_set_header X-Real-IP \$remote_addr;
-        proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
-        proxy_set_header X-Scheme \$scheme;
-    }
-
-    location /api {
-        proxy_pass http://apiserver/api;
-        proxy_set_header Host \$http_host;
-        proxy_set_header X-Real-IP \$remote_addr;
-        proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
-        proxy_set_header X-Scheme \$scheme;
-    }
-
-    location /access {
-        proxy_pass http://apiserver/access;
-        proxy_set_header Host \$http_host;
-        proxy_set_header X-Real-IP \$remote_addr;
-        proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
-        proxy_set_header X-Scheme \$scheme;
-    }
-
-    location /websocket {
-        proxy_pass http://apiserver/websocket;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade \$http_upgrade;
-        proxy_set_header Connection \$connection_upgrade;
-        proxy_set_header Host \$http_host;
-        proxy_set_header X-Real-IP \$remote_addr;
-        proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
-        proxy_read_timeout 86400;
-    }
-
-    location /machine {
-        proxy_pass http://apiserver/machine;
-        proxy_set_header Host \$http_host;
-        proxy_set_header X-Real-IP \$remote_addr;
-        proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
-        proxy_set_header X-Scheme \$scheme;
-    }
-
-    location /server {
-        proxy_pass http://apiserver/server;
-        proxy_set_header Host \$http_host;
-        proxy_set_header X-Real-IP \$remote_addr;
-        proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
-        proxy_set_header X-Scheme \$scheme;
-    }
-}
-MAINSAIL_CFG
-}
-
-check_vsdcard_section(){
-  # check if virtual sdcard is present in printer.cfg
-  if [ $(grep '^\[virtual_sdcard\]$' /home/pi/printer.cfg) ]; then
-    echo "Virtual sdcard already configured"
-  else
-    echo "No virtual sdcard entry found..."
-    echo "Configuring virtual sdcard..."
-# append the following lines to printer.cfg
-cat <<VSDCARD >> $PRINTER_CFG
-
-##########################
-### CREATED WITH KIAUH ###
-##########################
-[virtual_sdcard]
-path: ~/sdcard
-##########################
-##########################
-VSDCARD
-  fi
-}
-
-check_api_section(){
-  # check if api server is present in printer.cfg
-  if [ $(grep '^\[api_server\]$' /home/pi/printer.cfg) ]; then
-    echo "API server already configured"
-  else
-    echo "No API server entry found..."
-    echo "Configuring API server..."
-# append the following lines to printer.cfg
-cat <<API >> $PRINTER_CFG
-
-##########################
-### CREATED WITH KIAUH ###
-##########################
-[api_server]
-trusted_clients:
- 192.168.0.0/24
- 192.168.1.0/24
- 127.0.0.0/24
-##########################
-##########################
-API
-  fi
-}
-
-create_default_cfg(){
-cat <<MAINSAIL_CFG >> $PRINTER_CFG
-
-##########################
-### CREATED WITH KIAUH ###
-##########################
-[virtual_sdcard]
-path: ~/sdcard
-
-[api_server]
-trusted_clients:
- 192.168.0.0/24
- 192.168.1.0/24
- 127.0.0.0/24
-
-[pause_resume]
-
-[gcode_macro CANCEL]
-default_parameter_X: 230
-default_parameter_Y: 230
-default_parameter_Z: 10
-gcode:
-    M104 S0
-    M140 S0
-    M141 S0
-    M106 S0
-    CLEAR_PAUSE
-    RESET_SD
-
-[gcode_macro CANCEL_PRINT]
-gcode:
-    CANCEL
-
-[gcode_macro PAUSE]
-rename_existing: BASE_PAUSE
-default_parameter_X: 230
-default_parameter_Y: 230
-default_parameter_Z: 10
-gcode:
-    SAVE_GCODE_STATE NAME=PAUSE_state
-    BASE_PAUSE
-    G91
-    G1 E-1.7 F2100
-    G1 Z{Z}
-    G90
-    G1 X{X} Y{Y} F6000
-    G91
-
-[gcode_macro RESUME]
-rename_existing: BASE_RESUME
-gcode:
-    G91
-    G1 E1.7 F2100
-    G91
-    RESTORE_GCODE_STATE NAME=PAUSE_state MOVE=1
-    BASE_RESUME
-##########################
-##########################
-MAINSAIL_CFG
-}

scripts/install_moonraker.sh

@@ -0,0 +1,544 @@
+install_moonraker(){
+  python3_check
+  if [ $py_chk_ok = "true" ]; then
+    system_check_moonraker
+    #ask user for customization
+    get_user_selections_moonraker
+    #disable/remove haproxy/lighttpd
+    handle_haproxy_lighttpd
+    #moonraker main installation
+    moonraker_setup
+    check_for_folder_moonraker
+    #setup configs
+    setup_printer_config_moonraker
+    setup_moonraker_conf
+    #execute customizations
+    write_custom_trusted_clients
+    symlinks_moonraker
+    disable_octoprint
+    #after install actions
+    restart_moonraker
+    restart_klipper
+  else
+    ERROR_MSG="Python 3.7 or above required!\n Please upgrade your Python version first."
+    print_msg && clear_msg
+  fi
+}
+
+python3_check(){
+  status_msg "Your Python 3 version is: $(python3 --version)"
+  major=$(python3 --version | cut -d" " -f2 | cut -d"." -f1)
+  minor=$(python3 --version | cut -d"." -f2)
+  if [ $major -ge 3 ] && [ $minor -ge 7 ]; then
+    ok_msg "Python version ok!"
+    py_chk_ok="true"
+  else
+    py_chk_ok="false"
+  fi
+}
+
+system_check_moonraker(){
+  status_msg "Initializing Moonraker installation ..."
+  #check for existing printer.cfg and for the location
+  locate_printer_cfg
+  if [ -f $PRINTER_CFG ]; then
+    PRINTER_CFG_FOUND="true"
+    PRINTER_CFG_LOC=$PRINTER_CFG
+  else
+    PRINTER_CFG_FOUND="false"
+  fi
+  #check for existing klippy.log symlink in /klipper_config
+  [ ! -e ${HOME}/klipper_config/klippy.log ] && KLIPPY_SL_FOUND="false"
+  #check for existing moonraker.log symlink in /klipper_config
+  [ ! -e ${HOME}/klipper_config/moonraker.log ] && MOONRAKER_SL_FOUND="false"
+  #check for existing moonraker.conf
+  if [ ! -f ${HOME}/moonraker.conf ]; then
+    MOONRAKER_CONF_FOUND="false"
+  else
+    MOONRAKER_CONF_FOUND="true"
+  fi
+  #check if octoprint is installed
+  if systemctl is-enabled octoprint.service -q 2>/dev/null; then
+    unset OCTOPRINT_ENABLED
+    OCTOPRINT_ENABLED="true"
+  fi
+  #check if haproxy is installed
+  if [[ $(dpkg-query -f'${Status}' --show haproxy 2>/dev/null) = *\ installed ]]; then
+    HAPROXY_FOUND="true"
+  fi
+  #check if lighttpd is installed
+  if [[ $(dpkg-query -f'${Status}' --show lighttpd 2>/dev/null) = *\ installed ]]; then
+    LIGHTTPD_FOUND="true"
+  fi
+}
+
+get_user_selections_moonraker(){
+  #user selection for printer.cfg
+  if [ "$PRINTER_CFG_FOUND" = "false" ]; then
+    while true; do
+      echo
+      top_border
+      echo -e "|         ${red}WARNING! - No printer.cfg was found!${default}          |"
+      hr
+      echo -e "|  KIAUH can create a minimal printer.cfg with only the |"
+      echo -e "|  recommended Moonraker config entries if you wish.    |"
+      echo -e "|                                                       |"
+      echo -e "|  Please be aware, that this option will ${red}NOT${default} create a  |"
+      echo -e "|  fully working printer.cfg for you!                   |"
+      bottom_border
+      read -p "${cyan}###### Create a default printer.cfg? (Y/n):${default} " yn
+      case "$yn" in
+        Y|y|Yes|yes|"")
+          echo -e "###### > Yes"
+          SEL_DEF_CFG="true"
+          break;;
+        N|n|No|no)
+          echo -e "###### > No"
+          SEL_DEF_CFG="false"
+          break;;
+        *)
+          print_unkown_cmd
+          print_msg && clear_msg;;
+      esac
+    done
+  fi
+  #user selection for moonraker.log symlink
+  if [ "$KLIPPY_SL_FOUND" = "false" ]; then
+    while true; do
+      echo
+      read -p "${cyan}###### Create klippy.log symlink? (y/N):${default} " yn
+      case "$yn" in
+        Y|y|Yes|yes)
+          echo -e "###### > Yes"
+          SEL_KLIPPYLOG_SL="true"
+          break;;
+        N|n|No|no|"")
+          echo -e "###### > No"
+          SEL_KLIPPYLOG_SL="false"
+          break;;
+        *)
+          print_unkown_cmd
+          print_msg && clear_msg;;
+      esac
+    done
+  fi
+  #user selection for moonraker.log symlink
+  if [ "$MOONRAKER_SL_FOUND" = "false" ]; then
+    while true; do
+      echo
+      read -p "${cyan}###### Create moonraker.log symlink? (y/N):${default} " yn
+      case "$yn" in
+        Y|y|Yes|yes)
+          echo -e "###### > Yes"
+          SEL_MRLOG_SL="true"
+          break;;
+        N|n|No|no|"")
+          echo -e "###### > No"
+          SEL_MRLOG_SL="false"
+          break;;
+        *)
+          print_unkown_cmd
+          print_msg && clear_msg;;
+      esac
+    done
+  fi
+  #ask user for more trusted clients
+    while true; do
+      echo
+      top_border
+      echo -e "| Apart from devices of your local network, you can add |"
+      echo -e "| additional trusted clients to the moonraker.conf file |"
+      bottom_border
+      read -p "${cyan}###### Add additional trusted clients? (y/N):${default} " yn
+      case "$yn" in
+        Y|y|Yes|yes)
+          echo -e "###### > Yes"
+          ADD_TRUSTED_CLIENT="true"
+          custom_trusted_clients
+          break;;
+        N|n|No|no|"")
+          echo -e "###### > No"
+          ADD_TRUSTED_CLIENT="false"
+          break;;
+        *)
+          print_unkown_cmd
+          print_msg && clear_msg;;
+      esac
+    done
+  #ask user to disable octoprint when such installed service was found
+  if [ "$OCTOPRINT_ENABLED" = "true" ]; then
+    unset DISABLE_OPRINT
+    while true; do
+      echo
+      warn_msg "OctoPrint service found!"
+      echo -e "You might consider disabling the OctoPrint service,"
+      echo -e "since an active OctoPrint service may lead to unexpected"
+      echo -e "behavior of the Mainsail Webinterface."
+      read -p "${cyan}###### Do you want to disable OctoPrint now? (Y/n):${default} " yn
+      case "$yn" in
+        Y|y|Yes|yes|"")
+          echo -e "###### > Yes"
+          DISABLE_OPRINT="true"
+          break;;
+        N|n|No|no)
+          echo -e "###### > No"
+          DISABLE_OPRINT="false"
+          break;;
+        *)
+          print_unkown_cmd
+          print_msg && clear_msg;;
+      esac
+    done
+  fi
+  #notify user about haproxy or lighttpd services found and possible issues
+  if [ "$HAPROXY_FOUND" = "true" ] || [ "$LIGHTTPD_FOUND" = "true" ]; then
+    while true; do
+      echo
+      top_border
+      echo -e "| ${red}Possibly disruptive/incompatible services found!${default}      |"
+      hr
+      if [ "$HAPROXY_FOUND" = "true" ]; then
+        echo -e "| ● haproxy                                             |"
+      fi
+      if [ "$LIGHTTPD_FOUND" = "true" ]; then
+        echo -e "| ● lighttpd                                            |"
+      fi
+      hr
+      echo -e "| Having those packages installed can lead to unwanted  |"
+      echo -e "| behaviour. It is recommend to remove those packages.  |"
+      echo -e "|                                                       |"
+      echo -e "| 1) Remove packages (recommend)                        |"
+      echo -e "| 2) Disable only (may cause issues)                    |"
+      echo -e "| ${red}3) Skip this step (not recommended)${default}                   |"
+      bottom_border
+      read -p "${cyan}###### Please choose:${default} " action
+      case "$action" in
+        1)
+          echo -e "###### > Remove packages"
+          if [ "$HAPROXY_FOUND" = "true" ]; then
+            DISABLE_HAPROXY="false"
+            REMOVE_HAPROXY="true"
+          fi
+          if [ "$LIGHTTPD_FOUND" = "true" ]; then
+            DISABLE_LIGHTTPD="false"
+            REMOVE_LIGHTTPD="true"
+          fi
+          break;;
+        2)
+          echo -e "###### > Disable only"
+          if [ "$HAPROXY_FOUND" = "true" ]; then
+            DISABLE_HAPROXY="true"
+            REMOVE_HAPROXY="false"
+          fi
+          if [ "$LIGHTTPD_FOUND" = "true" ]; then
+            DISABLE_LIGHTTPD="true"
+            REMOVE_LIGHTTPD="false"
+          fi
+          break;;
+        3)
+          echo -e "###### > Skip"
+          DISABLE_LIGHTTPD="false"
+          REMOVE_LIGHTTPD="false"
+          DISABLE_HAPROXY="false"
+          REMOVE_HAPROXY="false"
+          break;;
+        *)
+          print_unkown_cmd
+          print_msg && clear_msg;;
+      esac
+    done
+  fi
+  status_msg "Installation will start now! Please wait ..."
+}
+
+#############################################################
+#############################################################
+
+moonraker_setup(){
+  dep=(wget curl unzip dfu-util libjpeg-dev zlib1g-dev)
+  dependency_check
+  status_msg "Downloading Moonraker ..."
+  #force remove existing moonraker dir
+  [ -d $MOONRAKER_DIR ] && rm -rf $MOONRAKER_DIR
+  #clone into fresh moonraker dir
+  cd ${HOME} && git clone $MOONRAKER_REPO
+  ok_msg "Download complete!"
+  status_msg "Installing Moonraker ..."
+  $MOONRAKER_DIR/scripts/install-moonraker.sh
+  #copy moonraker configuration for nginx to /etc/nginx/conf.d
+  setup_moonraker_nginx_cfg
+  #backup a possible existing printer.cfg at the old location and before patching in the new location
+  backup_printer_cfg
+  patch_klipper_sysfile "moonraker"
+  #re-run printer.cfg location function to read the new path for the printer.cfg
+  locate_printer_cfg
+  echo; ok_msg "Moonraker successfully installed!"
+}
+
+patch_klipper_sysfile(){
+  if [ -e $KLIPPER_SERVICE2 ]; then
+    status_msg "Checking /etc/default/klipper for necessary entries ..."
+    #patching new printer.cfg location to /etc/default/klipper
+    if [ "$1" = "moonraker" ]; then
+      if ! grep -q "/klipper_config/printer.cfg" $KLIPPER_SERVICE2; then
+        status_msg "Patching new printer.cfg location to /etc/default/klipper ..."
+        sudo sed -i "/KLIPPY_ARGS=/ s|$PRINTER_CFG|/home/${USER}/klipper_config/printer.cfg|" $KLIPPER_SERVICE2
+        ok_msg "New location is: '/home/${USER}/klipper_config/printer.cfg'"
+      fi
+    fi
+    #patching new UDS argument to /etc/default/klipper
+    if [ "$1" = "moonraker" ] || [ "$1" = "dwc2" ]; then
+      if ! grep -q -- "-a /tmp/klippy_uds" $KLIPPER_SERVICE2; then
+        status_msg "Patching unix domain socket to /etc/default/klipper ..."
+        #append the new argument to /tmp/klippy.log argument
+        sudo sed -i "/KLIPPY_ARGS/s/\.log/\.log -a \/tmp\/klippy_uds/" $KLIPPER_SERVICE2
+        ok_msg "Patching done!"
+      fi
+    fi
+  fi
+  if [ -e $KLIPPER_SERVICE3 ]; then
+    status_msg "Checking /etc/systemd/system/klipper.service for necessary entries ..."
+    #patching new printer.cfg location to /etc/systemd/system/klipper.service
+    if [ "$1" = "moonraker" ]; then
+      if ! grep -q "/klipper_config/printer.cfg" $KLIPPER_SERVICE3; then
+        status_msg "Patching new printer.cfg location to /etc/systemd/system/klipper.service ..."
+        sudo sed -i "/ExecStart=/ s|$PRINTER_CFG|/home/${USER}/klipper_config/printer.cfg|" $KLIPPER_SERVICE3
+        ok_msg "New location is: '/home/${USER}/klipper_config/printer.cfg'"
+        #set variable if file got edited
+        SERVICE_FILE_PATCHED="true"
+      fi
+    fi
+    #patching new UDS argument to /etc/systemd/system/klipper.service
+    if [ "$1" = "moonraker" ] || [ "$1" = "dwc2" ]; then
+      if ! grep -q -- "-a /tmp/klippy_uds" $KLIPPER_SERVICE3; then
+        status_msg "Patching unix domain socket to /etc/systemd/system/klipper.service ..."
+        #append the new argument to /tmp/klippy.log argument
+        sudo sed -i "/ExecStart/s/\.log/\.log -a \/tmp\/klippy_uds/" $KLIPPER_SERVICE3
+        ok_msg "Patching done!"
+        #set variable if file got edited
+        SERVICE_FILE_PATCHED="true"
+      fi
+    fi
+    #reloading the units is only needed when the service file was patched.
+    [ "$SERVICE_FILE_PATCHED" = "true" ] && status_msg "Reloading unit ..." && sudo systemctl daemon-reload
+  fi
+  ok_msg "Check complete!"
+  echo
+}
+
+check_for_folder_moonraker(){
+  #check for / create sdcard folder
+  if [ ! -d ${HOME}/sdcard ]; then
+    status_msg "Creating sdcard directory ..."
+    mkdir ${HOME}/sdcard
+    ok_msg "sdcard directory created!"
+  fi
+  ##check for / create klipper_config folder
+  if [ ! -d ${HOME}/klipper_config ]; then
+    status_msg "Creating klipper_config directory ..."
+    mkdir ${HOME}/klipper_config
+    ok_msg "klipper_config directory created!"
+  fi
+}
+
+#############################################################
+#############################################################
+
+setup_printer_config_moonraker(){
+  if [ "$PRINTER_CFG_FOUND" = "true" ]; then
+    #copy printer.cfg to new location if there is no printer.cfg at the new location already
+    if [ -f ${HOME}/printer.cfg ] && [ ! -f ${HOME}/klipper_config/printer.cfg ]; then
+      status_msg "Copy printer.cfg to new location ..."
+      cp ${HOME}/printer.cfg $PRINTER_CFG
+      ok_msg "printer.cfg location: '$PRINTER_CFG'"
+      ok_msg "Done!"
+    fi
+    #check printer.cfg for necessary moonraker entries
+    read_printer_cfg "moonraker" && write_printer_cfg
+  fi
+  if [ "$SEL_DEF_CFG" = "true" ]; then
+    status_msg "Creating minimal default printer.cfg ..."
+    create_minimal_cfg
+    ok_msg "printer.cfg location: '$PRINTER_CFG'"
+    ok_msg "Done!"
+  fi
+}
+
+setup_moonraker_conf(){
+  if [ "$MOONRAKER_CONF_FOUND" = "false" ]; then
+    status_msg "Creating moonraker.conf ..."
+    cp ${HOME}/kiauh/resources/moonraker.conf ${HOME}
+    ok_msg "moonraker.conf created!"
+    status_msg "Writing trusted clients to config ..."
+    write_default_trusted_clients
+    ok_msg "Trusted clients written!"
+  fi
+  #check for at least one trusted client in an already existing moonraker.conf
+  #if no entry is found, write default trusted client
+  if [ "$MOONRAKER_CONF_FOUND" = "true" ]; then
+    if grep "trusted_clients:" ${HOME}/moonraker.conf -q; then
+      TC_LINE=$(grep -n "trusted_clients:" ${HOME}/moonraker.conf | cut -d ":" -f1)
+      FIRST_IP_LINE=$(expr $TC_LINE + 1)
+      FIRST_IP=$(sed -n "$FIRST_IP_LINE"p ${HOME}/moonraker.conf | cut -d" " -f5)
+      #if [[ ! $FIRST_IP =~ ([0-9].[0-9].[0-9].[0-9]) ]]; then
+      if [ "$FIRST_IP" = "" ]; then
+        status_msg "Writing trusted clients to config ..."
+        backup_moonraker_conf && write_default_trusted_clients
+        ok_msg "Trusted clients written!"
+      fi
+    fi
+  fi
+}
+
+setup_moonraker_nginx_cfg(){
+  if [ ! -f $NGINX_CONFD/upstreams.conf ]; then
+    sudo cp ${SRCDIR}/kiauh/resources/moonraker_nginx.cfg $NGINX_CONFD/upstreams.conf
+  fi
+  if [ ! -f $NGINX_CONFD/common_vars.conf ]; then
+    sudo cp ${SRCDIR}/kiauh/resources/common_vars_nginx.cfg $NGINX_CONFD/common_vars.conf
+  fi
+}
+
+#############################################################
+#############################################################
+
+write_default_trusted_clients(){
+  DEFAULT_IP=$(hostname -I)
+  status_msg "Your devices current IP adress is:\n${cyan}● $DEFAULT_IP ${default}"
+  #make IP of the device KIAUH is exectuted on as
+  #default trusted client and expand the IP range from 0 - 255
+  DEFAULT_IP_RANGE="$(echo "$DEFAULT_IP" | cut -d"." -f1-3).0/24"
+  status_msg "Writing the following IP range to moonraker.conf:\n${cyan}● $DEFAULT_IP_RANGE ${default}"
+  #write the ip range in the first line below "trusted clients"
+  #example: 192.168.1.0/24
+  sed -i "/trusted_clients\:/a \ \ \ \ $DEFAULT_IP_RANGE" ${HOME}/moonraker.conf
+  ok_msg "IP range of ● $DEFAULT_IP_RANGE written to moonraker.conf!"
+}
+
+#############################################################
+#############################################################
+
+custom_trusted_clients(){
+  if [ "$ADD_TRUSTED_CLIENT" = "true" ]; then
+    unset trusted_arr
+    echo
+    top_border
+    echo -e "|  You can now add additional trusted clients to your   |"
+    echo -e "|  moonraker.conf file. Be warned, that there is no     |"
+    echo -e "|  spellcheck to check for valid input.                 |"
+    echo -e "|  Make sure to type the IP correct!                    |"
+    echo -e "|                                                       |"
+    echo -e "|  If you want to add IP ranges, you can type in e.g.:  |"
+    echo -e "|  192.168.1.0/24                                       |"
+    echo -e "|  This will add the IPs 192.168.1.1 to 192.168.1.254   |"
+    echo -e "|-------------------------------------------------------|"
+    echo -e "|  You can add as many IPs / IP ranges as you want.     |"
+    echo -e "|  When you are done type '${cyan}done${default}' to exit this dialoge.  |"
+    bottom_border
+    while true; do
+      read -p "${cyan}###### Enter IP and press ENTER:${default} " TRUSTED_IP
+      case "$TRUSTED_IP" in
+        done)
+          echo
+          echo -e "List of IPs to add:"
+          for ip in ${trusted_arr[@]}
+          do
+            echo -e "${cyan}● $ip ${default}"
+          done
+          while true; do
+            echo
+            echo -e "Select 'Yes' to confirm, 'No' to start again"
+            echo -e "or 'Q' to abort and skip."
+            read -p "${cyan}###### Confirm writing (Y/n/q):${default} " yn
+            case "$yn" in
+              Y|y|Yes|yes|"")
+                echo -e "###### > Yes"
+                TUSTED_CLIENT_CONFIRM="true"
+                break;;
+              N|n|No|no)
+                echo -e "###### > No"
+                custom_trusted_clients
+                break;;
+              Q|q)
+                unset trusted_arr
+                echo -e "###### > Abort"
+                echo -e "${red}Aborting ...${default}"
+                break;;
+            esac
+          done
+          break;;
+        *)
+          trusted_arr+=($TRUSTED_IP);;
+      esac
+    done
+  fi
+}
+
+write_custom_trusted_clients(){
+  if [ "$TUSTED_CLIENT_CONFIRM" = "true" ]; then
+    if [ "${#trusted_arr[@]}" != "0" ]; then
+      for ip in ${trusted_arr[@]}
+      do
+        sed -i "/trusted_clients\:/a \ \ \ \ $ip" ${HOME}/moonraker.conf
+      done
+      ok_msg "Custom IPs written to moonraker.conf!"
+    fi
+  fi
+}
+
+symlinks_moonraker(){
+  #create a klippy.log/moonraker.log symlink in klipper_config-dir just for convenience
+  if [ "$SEL_KLIPPYLOG_SL" = "true" ] && [ ! -e ${HOME}/klipper_config/klippy.log ]; then
+    status_msg "Creating klippy.log symlink ..."
+    ln -s /tmp/klippy.log ${HOME}/klipper_config
+    ok_msg "Symlink created!"
+  fi
+  if [ "$SEL_MRLOG_SL" = "true" ] && [ ! -e ${HOME}/klipper_config/moonraker.log ]; then
+    status_msg "Creating moonraker.log symlink ..."
+    ln -s /tmp/moonraker.log ${HOME}/klipper_config
+    ok_msg "Symlink created!"
+  fi
+}
+
+handle_haproxy_lighttpd(){
+  #handle haproxy
+  if [ "$DISABLE_HAPROXY" = "true" ]; then
+    if systemctl is-active haproxy -q; then
+      status_msg "Stopping haproxy service ..."
+      sudo /etc/init.d/haproxy stop && ok_msg "Service stopped!"
+    fi
+    sudo systemctl disable haproxy
+    ok_msg "Haproxy service disabled!"
+  else
+    if [ "$REMOVE_HAPROXY" = "true" ]; then
+      if systemctl is-active haproxy -q; then
+        status_msg "Stopping haproxy service ..."
+        sudo /etc/init.d/haproxy stop && ok_msg "Service stopped!"
+      fi
+      status_msg "Removing haproxy ..."
+      sudo apt-get remove haproxy -y
+      sudo update-rc.d -f haproxy remove
+      ok_msg "Haproxy removed!"
+    fi
+  fi
+  #handle lighttpd
+  if [ "$DISABLE_LIGHTTPD" = "true" ]; then
+    if systemctl is-active lighttpd -q; then
+      status_msg "Stopping lighttpd service ..."
+      sudo /etc/init.d/lighttpd stop && ok_msg "Service stopped!"
+    fi
+    sudo systemctl disable lighttpd
+    ok_msg "Lighttpd service disabled!"
+  else
+    if [ "$REMOVE_LIGHTTPD" = "true" ]; then
+      if systemctl is-active lighttpd -q; then
+        status_msg "Stopping lighttpd service ..."
+        sudo /etc/init.d/lighttpd stop && ok_msg "Service stopped!"
+      fi
+      status_msg "Removing lighttpd ..."
+      sudo apt-get remove lighttpd -y
+      sudo update-rc.d -f lighttpd remove
+      ok_msg "Lighttpd removed!"
+    fi
+  fi
+}

scripts/install_octoprint.sh

@@ -0,0 +1,213 @@
+install_octoprint(){
+  #check for other enabled web interfaces
+  unset SET_LISTEN_PORT
+  detect_enabled_sites
+  #ask user for customization
+  get_user_selections_octoprint
+  #octoprint main installation
+  octoprint_dependencies
+  octoprint_setup
+  add_groups
+  configure_autostart
+  add_reboot_permission
+  create_config_yaml
+  #execute customizations
+  set_nginx_cfg "octoprint"
+  set_hostname
+  #after install actions
+  load_octoprint_server
+}
+
+get_user_selections_octoprint(){
+  status_msg "Initializing OctoPrint installation ..."
+  #ask user to set a reverse proxy
+  octoprint_reverse_proxy_dialog
+  #ask to change hostname
+  [ "$SET_NGINX_CFG" = "true" ] && create_custom_hostname
+  status_msg "Installation will start now! Please wait ..."
+}
+
+octoprint_dependencies(){
+  dep=(
+    git
+    wget
+    python-pip
+    python-dev
+    libyaml-dev
+    build-essential
+    python-setuptools
+    python-virtualenv
+    )
+  dependency_check
+}
+
+octoprint_setup(){
+  if [ ! -d $OCTOPRINT_DIR ];then
+    status_msg "Create OctoPrint directory ..."
+    mkdir -p $OCTOPRINT_DIR && ok_msg "Directory created!"
+  fi
+  cd $OCTOPRINT_DIR
+  #create the virtualenv
+  status_msg "Set up virtualenv ..."
+  virtualenv venv
+  source venv/bin/activate
+  #install octoprint with pip
+  status_msg "Download and install OctoPrint ..."
+  pip install pip --upgrade
+  pip install --no-cache-dir octoprint
+  ok_msg "Download complete!"
+  #leave virtualenv
+  deactivate
+}
+
+add_groups(){
+  if [ ! "$(groups | grep tty)" ]; then
+    status_msg "Adding user '${USER}' to group 'tty' ..."
+    sudo usermod -a -G tty ${USER} && ok_msg "Done!"
+  fi
+  if [ ! "$(groups | grep dialout)" ]; then
+    status_msg "Adding user '${USER}' to group 'dialout' ..."
+    sudo usermod -a -G dialout ${USER} && ok_msg "Done!"
+  fi
+}
+
+configure_autostart(){
+  USER=$(whoami)
+  cd $OCTOPRINT_DIR
+  status_msg "Downloading files ..."
+  wget https://github.com/foosel/OctoPrint/raw/master/scripts/octoprint.init
+  wget https://github.com/foosel/OctoPrint/raw/master/scripts/octoprint.default
+  ok_msg "Files downloaded successfully!"
+  #make necessary changes in default file
+  status_msg "Configure OctoPrint Service ..."
+  DEFAULT_FILE=$OCTOPRINT_DIR/octoprint.default
+  sed -i "s/pi/$USER/g" $DEFAULT_FILE
+  sed -i "s/#BASEDIR=/BASEDIR=/" $DEFAULT_FILE
+  sed -i "s/#CONFIGFILE=/CONFIGFILE=/" $DEFAULT_FILE
+  sed -i "s/#DAEMON=/DAEMON=/" $DEFAULT_FILE
+  #move files to correct location
+  sudo mv octoprint.init $OCTOPRINT_SERVICE1
+  sudo mv octoprint.default $OCTOPRINT_SERVICE2
+  #make file in init.d executable
+  sudo chmod +x $OCTOPRINT_SERVICE1
+  status_msg "Reload systemd configuration files"
+  sudo update-rc.d octoprint defaults
+  sudo systemctl daemon-reload
+  ok_msg "Configuration complete!"
+  ok_msg "OctoPrint installed!"
+}
+
+add_reboot_permission(){
+  USER=$(whoami)
+  #create a backup when file already exists
+  if [ -f /etc/sudoers.d/octoprint-shutdown ]; then
+    sudo mv /etc/sudoers.d/octoprint-shutdown /etc/sudoers.d/octoprint-shutdown.old
+  fi
+  #create new permission file
+  status_msg "Add reboot permission to user '$USER' ..."
+  cd $OCTOPRINT_DIR
+  echo "$USER ALL=NOPASSWD: /sbin/shutdown" > octoprint-shutdown
+  sudo chown 0 octoprint-shutdown
+  sudo mv octoprint-shutdown /etc/sudoers.d/octoprint-shutdown
+  ok_msg "Permission set!"
+  sleep 2
+}
+
+octoprint_reverse_proxy_dialog(){
+  echo
+  top_border
+  echo -e "|  If you want to have nicer URLs or simply need        | "
+  echo -e "|  OctoPrint to run on port 80 (http's default port)    | "
+  echo -e "|  due to some network restrictions, you can set up a   | "
+  echo -e "|  reverse proxy instead of configuring OctoPrint to    | "
+  echo -e "|  run on port 80.                                      | "
+  bottom_border
+  while true; do
+    echo -e "${cyan}"
+    read -p "###### Do you want to set up a reverse proxy now? (y/N): " yn
+    echo -e "${default}"
+    case "$yn" in
+      Y|y|Yes|yes)
+        octoprint_port_check
+        break;;
+      N|n|No|no|"")
+        break;;
+      *)
+        print_unkown_cmd
+        print_msg && clear_msg;;
+    esac
+  done
+}
+
+octoprint_port_check(){
+  if [ "$OCTOPRINT_ENABLED" = "false" ]; then
+    if [ "$SITE_ENABLED" = "true" ]; then
+      status_msg "Detected other enabled interfaces:"
+      [ "$MAINSAIL_ENABLED" = "true" ] && echo "   ${cyan}● Mainsail - Port:$MAINSAIL_PORT${default}"
+      [ "$FLUIDD_ENABLED" = "true" ] && echo "   ${cyan}● Fluidd - Port:$FLUIDD_PORT${default}"
+      [ "$DWC2_ENABLED" = "true" ] && echo "   ${cyan}● DWC2 - Port:$DWC2_PORT${default}"
+      if [ "$MAINSAIL_PORT" = "80" ] || [ "$DWC2_PORT" = "80" ] || [ "$FLUIDD_PORT" = "80" ]; then
+        PORT_80_BLOCKED="true"
+        select_octoprint_port
+      fi
+    else
+      DEFAULT_PORT=$(grep listen ${SRCDIR}/kiauh/resources/octoprint_nginx.cfg | head -1 | sed 's/^\s*//' | cut -d" " -f2 | cut -d";" -f1)
+      SET_LISTEN_PORT=$DEFAULT_PORT
+    fi
+    SET_NGINX_CFG="true"
+  else
+    SET_NGINX_CFG="false"
+  fi
+}
+
+select_octoprint_port(){
+  if [ "$PORT_80_BLOCKED" = "true" ]; then
+    echo
+    top_border
+    echo -e "|                    ${red}!!!WARNING!!!${default}                      |"
+    echo -e "| ${red}You need to choose a different port for OctoPrint!${default}    |"
+    echo -e "| ${red}The following web interface is listening at port 80:${default}  |"
+    blank_line
+    [ "$MAINSAIL_PORT" = "80" ] && echo "|  ● Mainsail                                           |"
+    [ "$FLUIDD_PORT" = "80" ] && echo "|  ● Fluidd                                             |"
+    [ "$DWC2_PORT" = "80" ] && echo "|  ● DWC2                                          |"
+    blank_line
+    echo -e "| Make sure you don't choose a port which was already   |"
+    echo -e "| assigned to one of the other web interfaces!          |"
+    blank_line
+    echo -e "| Be aware: there is ${red}NO${default} sanity check for the following  |"
+    echo -e "| input. So make sure to choose a valid port!           |"
+    bottom_border
+    while true; do
+      read -p "${cyan}Please enter a new Port:${default} " NEW_PORT
+      if [ "$NEW_PORT" != "$MAINSAIL_PORT" ] && [ "$NEW_PORT" != "$FLUIDD_PORT" ] && [ "$NEW_PORT" != "$DWC2_PORT" ]; then
+        echo "Setting port $NEW_PORT for OctoPrint!"
+        SET_LISTEN_PORT=$NEW_PORT
+        break
+      else
+        echo "That port is already taken! Select a different one!"
+      fi
+    done
+  fi
+}
+
+create_config_yaml(){
+  if [ ! -d $OCTOPRINT_CFG_DIR ]; then
+    status_msg "Creating config.yaml ..."
+    mkdir $OCTOPRINT_CFG_DIR
+    cp ${HOME}/kiauh/resources/octoprint_config.cfg $OCTOPRINT_CFG_DIR/config.yaml
+    ok_msg "Config created!"
+  fi
+}
+
+load_octoprint_server(){
+  start_octoprint
+  #create an octoprint.log symlink in home-dir just for convenience
+  if [ ! -e ${HOME}/octoprint.log ]; then
+      status_msg "Creating octoprint.log Symlink ..."
+      ln -s ${HOME}/.octoprint/logs/octoprint.log ${HOME}/octoprint.log && ok_msg "Symlink created!"
+  fi
+  ok_msg "OctoPrint is now running on:"
+  ok_msg "$(hostname -I | cut -d " " -f1):5000 or"
+  ok_msg "http://localhost:5000"; echo
+}

scripts/network_functions.sh

@@ -0,0 +1,171 @@
+set_nginx_cfg(){
+  if [ "$SET_NGINX_CFG" = "true" ]; then
+    #check for dependencies
+    dep=(nginx)
+    dependency_check
+    #execute operations
+    status_msg "Creating Nginx configuration for $1 ..."
+    #copy content from resources to the respective nginx config file
+    cat ${SRCDIR}/kiauh/resources/$1_nginx.cfg > ${SRCDIR}/kiauh/resources/$1
+    ##edit the nginx config file before moving it
+    if [ "$SET_LISTEN_PORT" != "$DEFAULT_PORT" ]; then
+      status_msg "Configuring port for $1 ..."
+      #set listen port ipv4
+      sed -i "s/listen\s[0-9]*;/listen $SET_LISTEN_PORT;/" ${SRCDIR}/kiauh/resources/$1
+      #set listen port ipv6
+      sed -i "s/listen\s\[\:*\]\:[0-9]*;/listen \[::\]\:$SET_LISTEN_PORT;/" ${SRCDIR}/kiauh/resources/$1
+    fi
+    #set correct user
+    if [ "$1" = "mainsail" ] || [ "$1" = "fluidd" ]; then
+      sudo sed -i "/root/s/pi/${USER}/" ${SRCDIR}/kiauh/resources/$1
+    fi
+    #moving the config file into correct directory
+    sudo mv ${SRCDIR}/kiauh/resources/$1 /etc/nginx/sites-available/$1
+    ok_msg "Nginx configuration for $1 was set!"
+    if [ "$SET_LISTEN_PORT" != "" ]; then
+      ok_msg "$1 listening on port $SET_LISTEN_PORT!"
+    else
+      ok_msg "$1 listening on default port $DEFAULT_PORT!"
+    fi
+    #remove nginx default config
+    [ -e /etc/nginx/sites-enabled/default ] && sudo rm /etc/nginx/sites-enabled/default
+    #create symlink for own sites
+    [ ! -e /etc/nginx/sites-enabled/$1 ] && sudo ln -s /etc/nginx/sites-available/$1 /etc/nginx/sites-enabled/
+    restart_nginx
+  fi
+}
+
+read_listen_port(){
+  LISTEN_PORT=$(grep listen /etc/nginx/sites-enabled/$1 | head -1 | sed 's/^\s*//' | cut -d" " -f2 | cut -d";" -f1)
+}
+
+detect_enabled_sites(){
+  #check if there is another UI config already installed
+  #and reads the port they are listening on
+  if [ -e /etc/nginx/sites-enabled/mainsail ]; then
+    SITE_ENABLED="true" && MAINSAIL_ENABLED="true"
+    read_listen_port "mainsail"
+    MAINSAIL_PORT=$LISTEN_PORT
+    #echo "debug: Mainsail listens on port: $MAINSAIL_PORT"
+  else
+    MAINSAIL_ENABLED="false"
+  fi
+  if [ -e /etc/nginx/sites-enabled/fluidd ]; then
+    SITE_ENABLED="true" && FLUIDD_ENABLED="true"
+    read_listen_port "fluidd"
+    FLUIDD_PORT=$LISTEN_PORT
+    #echo "debug: Fluidd listens on port: $FLUIDD_PORT"
+  else
+    FLUIDD_ENABLED="false"
+  fi
+  if [ -e /etc/nginx/sites-enabled/dwc2 ]; then
+    SITE_ENABLED="true" && DWC2_ENABLED="true"
+    read_listen_port "dwc2"
+    DWC2_PORT=$LISTEN_PORT
+    #echo "debug: DWC2 listens on port: $DWC2_PORT"
+  else
+    DWC2_ENABLED="false"
+  fi
+  if [ -e /etc/nginx/sites-enabled/octoprint ]; then
+    SITE_ENABLED="true" && OCTOPRINT_ENABLED="true"
+    read_listen_port "octoprint"
+    OCTOPRINT_PORT=$LISTEN_PORT
+    #echo "debug: OctoPrint listens on port: $OCTOPRINT_PORT"
+  else
+    OCTOPRINT_ENABLED="false"
+  fi
+}
+
+create_custom_hostname(){
+  echo
+  top_border
+  echo -e "|  You can change the hostname of this machine to use   |"
+  echo -e "|  that name to open the Interface in your browser.     |"
+  echo -e "|                                                       |"
+  echo -e "|  E.g.: If you set the hostname to 'my-printer' you    |"
+  echo -e "|        can open DWC2/Mainsail/Fluidd/Octoprint by     |"
+  echo -e "|        browsing to: http://my-printer.local           |"
+  bottom_border
+  while true; do
+    read -p "${cyan}###### Do you want to change the hostname? (y/N):${default} " yn
+    case "$yn" in
+      Y|y|Yes|yes)
+        user_input_hostname
+        break;;
+      N|n|No|no|"") break;;
+      *)
+        print_unkown_cmd
+        print_msg && clear_msg;;
+    esac
+  done
+}
+
+user_input_hostname(){
+    unset NEW_HOSTNAME
+    unset HOSTNAME_VALID
+    unset HOSTENAME_CONFIRM
+    echo
+    top_border
+    echo -e "|  ${green}Allowed characters: a-z, 0-9 and single '-'${default}          |"
+    echo -e "|  ${red}No special characters allowed!${default}                       |"
+    echo -e "|  ${red}No leading or trailing '-' allowed!${default}                  |"
+    bottom_border
+    while true; do
+      read -p "${cyan}###### Please set the new hostname:${default} " NEW_HOSTNAME
+      if [[ $NEW_HOSTNAME =~ ^[^\-\_]+([0-9a-z]\-{0,1})+[^\-\_]+$ ]]; then
+        ok_msg "'$NEW_HOSTNAME' is a valid hostname!"
+        HOSTNAME_VALID="true"
+        while true; do
+          echo
+          read -p "${cyan}###### Do you want '$NEW_HOSTNAME' to be the new hostname? (Y/n):${default} " yn
+          case "$yn" in
+            Y|y|Yes|yes|"")
+              echo -e "###### > Yes"
+              HOSTENAME_CONFIRM="true"
+              break;;
+            N|n|No|no)
+              echo -e "###### > No"
+              echo -e "${red}Skip hostname change ...${default}"
+              HOSTENAME_CONFIRM="false"
+              break;;
+            *)
+              print_unkown_cmd
+              print_msg && clear_msg;;
+          esac
+        done
+      break
+      else
+        warn_msg "'$NEW_HOSTNAME' is not a valid hostname!"
+      fi
+    done
+}
+
+set_hostname(){
+  if [ "$HOSTNAME_VALID" = "true" ] && [ "$HOSTENAME_CONFIRM" = "true" ]; then
+    #check for dependencies
+    dep=(avahi-daemon)
+    dependency_check
+    #execute operations
+    #get current hostname and write to variable
+    HOSTNAME=$(hostname)
+    #create host file if missing or create backup of existing one with current date&time
+    if [ -f /etc/hosts ]; then
+      status_msg "Creating backup of hosts file ..."
+      get_date
+      sudo cp /etc/hosts /etc/hosts."$current_date".bak
+      ok_msg "Backup done!"
+      ok_msg "File:'/etc/hosts."$current_date".bak'"
+    else
+      sudo touch /etc/hosts
+    fi
+    #set hostname in /etc/hostname
+    status_msg "Setting hostname to '$NEW_HOSTNAME' ..."
+    status_msg "Please wait ..."
+    sudo hostnamectl set-hostname "$NEW_HOSTNAME"
+    #write new hostname to /etc/hosts
+    status_msg "Writing new hostname to /etc/hosts ..."
+    echo "127.0.0.1       $NEW_HOSTNAME" | sudo tee -a /etc/hosts &>/dev/null
+    ok_msg "New hostname successfully configured!"
+    ok_msg "Remember to reboot for the changes to take effect!"
+  fi
+}

scripts/remove.sh

@@ -2,6 +2,7 @@ remove_klipper(){
   data_arr=(
   /etc/init.d/klipper
   /etc/default/klipper
+  /etc/systemd/system/klipper.service
   $KLIPPER_DIR
   $KLIPPY_ENV_DIR
   ${HOME}/klippy.log
@@ -10,99 +11,163 @@ remove_klipper(){
   if [ "$ERROR_MSG" = "" ]; then
     stop_klipper
     if [[ -e /etc/init.d/klipper || -e /etc/default/klipper ]]; then
-      status_msg "Removing klipper service ..."
+      status_msg "Removing Klipper Service ..."
+      sudo rm -rf /etc/init.d/klipper /etc/default/klipper
       sudo update-rc.d -f klipper remove
-      sudo rm -rf /etc/init.d/klipper /etc/default/klipper && ok_msg "Klipper service removed!"
+      sudo systemctl disable klipper
+      sudo systemctl daemon-reload
+      ok_msg "Klipper Service removed!"
+    fi
+    if [ -e /etc/systemd/system/klipper.service ]; then
+      status_msg "Removing Klipper Service ..."
+      sudo rm -rf /etc/systemd/system/klipper.service
+      sudo update-rc.d -f klipper remove
+      sudo systemctl disable klipper
+      sudo systemctl daemon-reload
+      ok_msg "Klipper Service removed!"
     fi
     if [[ -d $KLIPPER_DIR || -d $KLIPPY_ENV_DIR ]]; then
-      status_msg "Removing klipper and klippy-env diretory ..."
+      status_msg "Removing Klipper and klippy-env directory ..."
       rm -rf $KLIPPER_DIR $KLIPPY_ENV_DIR && ok_msg "Directories removed!"
     fi
     if [[ -L ${HOME}/klippy.log || -e /tmp/klippy.log ]]; then
-      status_msg "Removing klippy.log symlink ..."
+      status_msg "Removing klippy.log Symlink ..."
       rm -rf ${HOME}/klippy.log /tmp/klippy.log && ok_msg "Symlink removed!"
     fi
-    ok_msg "Klipper successfully removed!"
+    CONFIRM_MSG=" Klipper successfully removed!"
   fi
 }
 
+#############################################################
+#############################################################
+
 remove_dwc2(){
   data_arr=(
+  /etc/init.d/dwc
+  /etc/default/dwc
+  /etc/systemd/system/dwc.service
   $DWC2FK_DIR
-  $TORNADO_DIR1
-  $TORNADO_DIR2
-  $WEB_DWC2
+  $DWC_ENV_DIR
   $DWC2_DIR
+  /etc/nginx/sites-available/dwc2
+  /etc/nginx/sites-enabled/dwc2
   )
-  print_error "DWC2-for-Klipper &\n DWC2 Web UI" && data_count=()
+  print_error "DWC2-for-Klipper-Socket &\n DWC2 Web UI" && data_count=()
   if [ "$ERROR_MSG" = "" ]; then
+    if systemctl is-active dwc -q; then
+      status_msg "Stopping DWC2-for-Klipper-Socket Service ..."
+      sudo systemctl stop dwc && sudo systemctl disable dwc
+      ok_msg "Service stopped!"
+    fi
+    #remove if init.d service
+    if [[ -e /etc/init.d/dwc || -e /etc/default/dwc ]]; then
+      status_msg "Init.d Service found ..."
+      status_msg "Removing DWC2-for-Klipper-Socket Service ..."
+      sudo rm -rf /etc/init.d/dwc /etc/default/dwc
+      sudo update-rc.d -f dwc remove
+      ok_msg "DWC2-for-Klipper-Socket Service removed!"
+    fi
+    #remove if systemd service
+    if [ -e /etc/systemd/system/dwc.service ]; then
+      status_msg "Systemd Service found ..."
+      status_msg "Removing DWC2-for-Klipper-Socket Service ..."
+      sudo rm -rf /etc/systemd/system/dwc.service
+      ok_msg "DWC2-for-Klipper-Socket Service removed!"
+    fi
     if [ -d $DWC2FK_DIR ]; then
-      status_msg "Removing dwc2-for-klipper directory ..."
+      status_msg "Removing DWC2-for-Klipper-Socket directory ..."
       rm -rf $DWC2FK_DIR && ok_msg "Directory removed!"
     fi
-    if [ -d $TORNADO_DIR1 ]; then
-      status_msg "Removing tornado from klippy-env ..."
-      rm -rf $TORNADO_DIR1 $TORNADO_DIR2 && ok_msg "Tornado removed!"
-    fi
-    if [ -e $WEB_DWC2 ]; then
-      status_msg "Removing web_dwc2.py symlink from klippy ..."
-      rm -rf $WEB_DWC2 && ok_msg "File removed!"
+    if [ -d $DWC_ENV_DIR ]; then
+      status_msg "Removing DWC2-for-Klipper-Socket virtualenv ..."
+      rm -rf $DWC_ENV_DIR && ok_msg "File removed!"
     fi
     if [ -d $DWC2_DIR ]; then
-      status_msg "Removing dwc2 directory ..."
+      status_msg "Removing DWC2 directory ..."
       rm -rf $DWC2_DIR && ok_msg "Directory removed!"
     fi
-    ok_msg "DWC2-for-Klipper & DWC2 Web UI successfully removed!"
+    #remove dwc2 config for nginx
+    if [ -e /etc/nginx/sites-available/dwc2 ]; then
+      status_msg "Removing DWC2 configuration for Nginx ..."
+      sudo rm /etc/nginx/sites-available/dwc2 && ok_msg "File removed!"
+    fi
+    #remove dwc2 symlink for nginx
+    if [ -L /etc/nginx/sites-enabled/dwc2 ]; then
+      status_msg "Removing DWC2 Symlink for Nginx ..."
+      sudo rm /etc/nginx/sites-enabled/dwc2 && ok_msg "File removed!"
+    fi
+    CONFIRM_MSG=" DWC2-for-Klipper-Socket & DWC2 successfully removed!"
   fi
 }
 
-remove_mainsail(){
+#############################################################
+#############################################################
+
+remove_moonraker(){
   data_arr=(
-  $MAINSAIL_SERVICE1
-  $MAINSAIL_SERVICE2
-  $MAINSAIL_DIR
+  $MOONRAKER_SERVICE1
+  $MOONRAKER_SERVICE2
+  $MOONRAKER_DIR
+  $MOONRAKER_ENV_DIR
+  $NGINX_CONFD/upstreams.conf
+  $NGINX_CONFD/common_vars.conf
+  ${HOME}/moonraker.conf
   ${HOME}/moonraker.log
+  ${HOME}/klipper_config/moonraker.log
+  ${HOME}/klipper_config/klippy.log
   ${HOME}/.klippy_api_key
   ${HOME}/.moonraker_api_key
-  ${HOME}/moonraker-env
-  /etc/nginx/sites-available/mainsail
-  /etc/nginx/sites-enabled/mainsail
-  /etc/init.d/nginx
-  /etc/default/nginx
   )
-  print_error "Mainsail" && data_count=()
+  print_error "Moonraker" && data_count=()
   if [ "$ERROR_MSG" = "" ]; then
+    if [ -e ${HOME}/moonraker.conf ]; then
+      unset REMOVE_MOONRAKER_CONF
+      while true; do
+        echo
+        read -p "${cyan}###### Delete moonraker.conf? (y/N):${default} " yn
+        case "$yn" in
+          Y|y|Yes|yes)
+            echo -e "###### > Yes"
+            REMOVE_MOONRAKER_CONF="true"
+            break;;
+          N|n|No|no|"")
+            echo -e "###### > No"
+            REMOVE_MOONRAKER_CONF="false"
+            break;;
+          *)
+            print_unkown_cmd
+            print_msg && clear_msg;;
+        esac
+      done
+    fi
+    status_msg "Processing ..."
     stop_moonraker
     #remove moonraker services
     if [[ -e /etc/init.d/moonraker || -e /etc/default/moonraker ]]; then
-      status_msg "Removing moonraker service ..."
+      status_msg "Removing Moonraker Service ..."
       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
-    #remove mainsail dir
-    if [ -d $MAINSAIL_DIR ]; then
-      status_msg "Removing mainsail directory ..."
-      rm -rf $MAINSAIL_DIR && 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-env
-    if [ -d ${HOME}/moonraker-env ]; then
-      status_msg "Removing moonraker virtualenv ..."
-      rm -rf ${HOME}/moonraker-env && ok_msg "Directory removed!"
+    #remove moonraker.conf
+    if [ "$REMOVE_MOONRAKER_CONF" = "true" ]; then
+      status_msg "Removing moonraker.conf ..."
+      rm -rf ${HOME}/moonraker.conf && ok_msg "File removed!"
     fi
-    #remove moonraker.log 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!"
+    #remove moonraker.log and symlink
+    if [[ -L ${HOME}/moonraker.log || -L ${HOME}/klipper_config/moonraker.log || -L ${HOME}/klipper_config/klippy.log || -e /tmp/moonraker.log ]]; then
+      status_msg "Removing Logs and Symlinks ..."
+      rm -rf ${HOME}/moonraker.log ${HOME}/klipper_config/moonraker.log ${HOME}/klipper_config/klippy.log /tmp/moonraker.log
+      ok_msg "Files removed!"
     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!"
+    #remove moonraker nginx config
+    if [[ -e $NGINX_CONFD/upstreams.conf || -e $NGINX_CONFD/common_vars.conf ]]; then
+      status_msg "Removing Moonraker NGINX configuration ..."
+      sudo rm -f $NGINX_CONFD/upstreams.conf $NGINX_CONFD/common_vars.conf && ok_msg "Moonraker NGINX configuration removed!"
     fi
     #remove legacy api key
     if [ -e ${HOME}/.klippy_api_key ]; then
@@ -114,32 +179,155 @@ remove_mainsail(){
       status_msg "Removing API Key ..."
       rm ${HOME}/.moonraker_api_key && ok_msg "Done!"
     fi
-    remove_nginx
-    ok_msg "Mainsail successfully removed!"
+    CONFIRM_MSG="Moonraker successfully removed!"
   fi
 }
 
-remove_nginx(){
-  #ask for complete removal of nginx if installed
-  if [[ $(dpkg-query -f'${Status}' --show nginx 2>/dev/null) = *\ installed ]]  ; then
-    while true; do
-      echo
-      read -p "Do you want to completely remove (purge) nginx? (Y/n): " yn
-      case "$yn" in
-        Y|y|Yes|yes|"")
-        status_msg "Stopping and removing nginx service ..."
-        if [ -e /etc/init.d/nginx ]; then
-          sudo /etc/init.d/nginx stop && ok_msg "Nginx service stopped!"
-          sudo rm /etc/init.d/nginx && ok_msg "Nginx service removed!"
-        fi
-        if [ -e /etc/default/nginx ]; then
-          sudo rm /etc/default/nginx
-        fi
-        status_msg "Purging nginx from system ..."
-        sudo apt-get purge nginx nginx-common -y && ok_msg "Nginx removed!"
-        break;;
-        N|n|No|no) break;;
-      esac
-    done
+#############################################################
+#############################################################
+
+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
-}
+}
+
+remove_fluidd(){
+  data_arr=(
+  $FLUIDD_DIR
+  /etc/nginx/sites-available/fluidd
+  /etc/nginx/sites-enabled/fluidd
+  )
+  print_error "Fluidd" && data_count=()
+  if [ "$ERROR_MSG" = "" ]; then
+    #remove fluidd dir
+    if [ -d $FLUIDD_DIR ]; then
+      status_msg "Removing Fluidd directory ..."
+      rm -rf $FLUIDD_DIR && ok_msg "Directory removed!"
+    fi
+    #remove fluidd config for nginx
+    if [ -e /etc/nginx/sites-available/fluidd ]; then
+      status_msg "Removing Fluidd configuration for Nginx ..."
+      sudo rm /etc/nginx/sites-available/fluidd && ok_msg "File removed!"
+    fi
+    #remove fluidd symlink for nginx
+    if [ -L /etc/nginx/sites-enabled/fluidd ]; then
+      status_msg "Removing Fluidd Symlink for Nginx ..."
+      sudo rm /etc/nginx/sites-enabled/fluidd && ok_msg "File removed!"
+    fi
+    CONFIRM_MSG="Fluidd successfully removed!"
+  fi
+}
+
+#############################################################
+#############################################################
+
+remove_octoprint(){
+  data_arr=(
+  $OCTOPRINT_SERVICE1
+  $OCTOPRINT_SERVICE2
+  $OCTOPRINT_DIR
+  $OCTOPRINT_CFG_DIR
+  ${HOME}/octoprint.log
+  /etc/sudoers.d/octoprint-shutdown
+  /etc/nginx/sites-available/octoprint
+  /etc/nginx/sites-enabled/octoprint
+  )
+  print_error "OctoPrint" && data_count=()
+  if [ "$ERROR_MSG" = "" ]; then
+    stop_octoprint
+    if [[ -e $OCTOPRINT_SERVICE1 || -e $OCTOPRINT_SERVICE2 ]]; then
+      status_msg "Removing OctoPrint Service ..."
+      sudo update-rc.d -f octoprint remove
+      sudo rm -rf $OCTOPRINT_SERVICE1 $OCTOPRINT_SERVICE2 && ok_msg "OctoPrint Service removed!"
+    fi
+    if [[ -d $OCTOPRINT_DIR || -d $OCTOPRINT_CFG_DIR ]]; then
+      status_msg "Removing OctoPrint and .octoprint directory ..."
+      rm -rf $OCTOPRINT_DIR $OCTOPRINT_CFG_DIR && ok_msg "Directories removed!"
+    fi
+    if [ -f /etc/sudoers.d/octoprint-shutdown ]; then
+      sudo rm -rf /etc/sudoers.d/octoprint-shutdown
+    fi
+    if [ -L ${HOME}/octoprint.log ]; then
+      status_msg "Removing octoprint.log Symlink ..."
+      rm -rf ${HOME}/octoprint.log && ok_msg "Symlink removed!"
+    fi
+    #remove octoprint config for nginx
+    if [ -e /etc/nginx/sites-available/octoprint ]; then
+      status_msg "Removing OctoPrint configuration for Nginx ..."
+      sudo rm /etc/nginx/sites-available/octoprint && ok_msg "File removed!"
+    fi
+    #remove octoprint symlink for nginx
+    if [ -L /etc/nginx/sites-enabled/octoprint ]; then
+      status_msg "Removing OctoPrint Symlink for Nginx ..."
+      sudo rm /etc/nginx/sites-enabled/octoprint && ok_msg "File removed!"
+    fi
+    CONFIRM_MSG=" OctoPrint successfully removed!"
+  fi
+}
+
+#############################################################
+#############################################################
+
+remove_nginx(){
+  if [[ $(dpkg-query -f'${Status}' --show nginx 2>/dev/null) = *\ installed ]]  ; then
+    if systemctl is-active nginx -q; then
+      status_msg "Stopping Nginx service ..."
+      sudo service nginx stop && sudo systemctl disable nginx
+      ok_msg "Service stopped!"
+    fi
+    status_msg "Purging Nginx from system ..."
+    sudo apt-get purge nginx nginx-common -y
+    sudo update-rc.d -f nginx remove
+    CONFIRM_MSG=" Nginx successfully removed!"
+  else
+    ERROR_MSG=" Looks like Nginx was already removed!\n Skipping..."
+  fi
+}
+
+remove_klipperscreen(){
+  data_arr=(
+  $KLIPPERSCREEN_DIR
+  $KLIPPERSCREEN_ENV_DIR
+  /etc/systemd/system/KlipperScreen.service
+  )
+  print_error "KlipperScreen" && data_count=()
+  if [ "$ERROR_MSG" = "" ]; then
+    #remove KlipperScreen dir
+    if [ -d $KLIPPERSCREEN_DIR ]; then
+      status_msg "Removing KlipperScreen directory ..."
+      rm -rf $KLIPPERSCREEN_DIR && ok_msg "Directory removed!"
+    fi
+    if [ -d $KLIPPERSCREEN_ENV_DIR ]; then
+      status_msg "Removing KlipperScreen VENV directory ..."
+      rm -rf $KLIPPERSCREEN_ENV_DIR && ok_msg "Directory removed!"
+    fi
+    #remove KlipperScreen systemd file
+    if [ -e /etc/systemd/system/KlipperScreen.service ]; then
+      status_msg "Removing KlipperScreen Service ..."
+      sudo rm /etc/systemd/system/KlipperScreen.service && ok_msg "File removed!"
+    fi
+    CONFIRM_MSG="KlipperScreen successfully removed!"
+  fi
+}

scripts/rollback.sh

@@ -0,0 +1,92 @@
+save_klipper_state(){
+  source_ini
+  #read current klipper state
+  cd $KLIPPER_DIR
+  COMMIT_STATE=$(git rev-parse --short HEAD)
+  if [ "$GET_BRANCH" = "master" ]; then
+    ORI_OLD=$previous_origin_state
+    ORI_NEW=$COMMIT_STATE
+    sed -i "/previous_origin_state=/s/$ORI_OLD/$ORI_NEW/" $INI_FILE
+  elif [ "$GET_BRANCH" = "scurve-shaping" ]; then
+    SHA_OLD=$previous_shaping_state
+    SHA_NEW=$COMMIT_STATE
+    sed -i "/previous_shaping_state=/s/$SHA_OLD/$SHA_NEW/" $INI_FILE
+  elif [ "$GET_BRANCH" = "scurve-smoothing" ]; then
+    SMO_OLD=$previous_smoothing_state
+    SMO_NEW=$COMMIT_STATE
+    sed -i "/previous_smoothing_state=/s/$SMO_OLD/$SMO_NEW/" $INI_FILE
+  fi
+}
+
+load_klipper_state(){
+  source_ini
+  print_branch
+  cd $KLIPPER_DIR
+  CURRENT_COMMIT=$(git rev-parse --short=8 HEAD)
+  if [ "$GET_BRANCH" = "origin/master" ] || [ "$GET_BRANCH" = "master" ]; then
+    PREVIOUS_COMMIT=$previous_origin_state
+  elif [ "$GET_BRANCH" = "scurve-shaping" ]; then
+    PREVIOUS_COMMIT=$previous_shaping_state
+  elif [ "$GET_BRANCH" = "scurve-smoothing" ]; then
+    PREVIOUS_COMMIT=$previous_smoothing_state
+  fi
+  CURRENT_COMMIT_DATE=$(git show -s --format=%cd --date=short $CURRENT_COMMIT)
+  if [ "$PREVIOUS_COMMIT" != "0" ]; then
+    PREVIOUS_COMMIT_DATE=$(git show -s --format=%cd --date=short $PREVIOUS_COMMIT)
+  fi
+  if [ "$PREVIOUS_COMMIT" = "0" ]; then
+    CURR_UI=$(echo -e "${green}$CURRENT_COMMIT from $CURRENT_COMMIT_DATE${default}")
+    PREV_UI=$(echo -e "${red}None${default}                    ")
+  else
+    if [ "$CURRENT_COMMIT" = "$PREVIOUS_COMMIT" ]; then
+      CURR_UI=$(echo -e "${green}$CURRENT_COMMIT from $CURRENT_COMMIT_DATE${default}")
+      PREV_UI=$(echo -e "${green}$PREVIOUS_COMMIT from $PREVIOUS_COMMIT_DATE${default}")
+    else
+      CURR_UI=$(echo -e "${yellow}$CURRENT_COMMIT from $CURRENT_COMMIT_DATE${default}")
+      PREV_UI=$(echo -e "${yellow}$PREVIOUS_COMMIT from $PREVIOUS_COMMIT_DATE${default}")
+    fi
+  fi
+  rollback_ui
+  rollback_klipper
+}
+
+rollback_klipper(){
+  if [ "$PREVIOUS_COMMIT" != "0" ] && [ "$CURRENT_COMMIT" != "$PREVIOUS_COMMIT" ]; then
+    while true; do
+        echo -e "${cyan}"
+        read -p "###### Do you want to rollback to $PREVIOUS_COMMIT? (Y/n): " yn
+        echo -e "${default}"
+        case "$yn" in
+          Y|y|Yes|yes|"")
+            clear
+            print_header
+              status_msg "Rolling back to $PREVIOUS_COMMIT ..."
+              git reset --hard $PREVIOUS_COMMIT -q
+              ok_msg "Rollback complete!"; echo
+            load_klipper_state
+            break;;
+          N|n|No|no) clear; advanced_menu; break;;
+          Q|q) clear; advanced_menu; break;;
+          *)
+            print_unkown_cmd
+            print_msg && clear_msg;;
+      esac
+    done
+  else
+    while true; do
+      echo -e "${cyan}"
+      read -p "Perform action: " action; echo
+      echo -e "${default}"
+      case "$action" in
+        Q|q)
+          clear; advanced_menu; break;;
+        *)
+          clear
+          print_header
+          print_unkown_cmd
+          print_msg && clear_msg
+          rollback_ui;;
+      esac
+    done
+  fi
+}

scripts/status.sh

@@ -1,11 +1,24 @@
+kiauh_status(){
+  if [ -d "${SRCDIR}/kiauh/.git" ]; then
+    cd ${HOME}/kiauh
+    git fetch -q
+    if git branch -a | grep "* master" -q; then
+      if [[ "$(git rev-parse --short=8 origin/master)" != "$(git rev-parse --short=8 HEAD)" ]]; then
+        KIAUH_UPDATE_AVAIL="true"
+      fi
+    fi
+  fi
+}
+
 klipper_status(){
   kcount=0
   klipper_data=(
+    SERVICE
     $KLIPPER_DIR
     $KLIPPY_ENV_DIR
-    $KLIPPER_SERVICE1
-    $KLIPPER_SERVICE2
   )
+  #remove the "SERVICE" entry from the klipper_data array if a klipper service is installed
+  [ "$(systemctl list-units --full -all -t service --no-legend | grep -F "klipper.service")" ] && unset klipper_data[0]
   #count+1 for each found data-item from array
   for kd in "${klipper_data[@]}"
   do
@@ -14,11 +27,11 @@ klipper_status(){
     fi
   done
   if [ "$kcount" == "${#klipper_data[*]}" ]; then
-    KLIPPER_STATUS="${green}Installed!${default}         "
+    KLIPPER_STATUS="${green}Installed!${default}      "
   elif [ "$kcount" == 0 ]; then
-    KLIPPER_STATUS="${red}Not installed!${default}     "
+    KLIPPER_STATUS="${red}Not installed!${default}  "
   else
-    KLIPPER_STATUS="${yellow}Incomplete!${default}        "
+    KLIPPER_STATUS="${yellow}Incomplete!${default}     "
   fi
 }
 
@@ -26,10 +39,8 @@ dwc2_status(){
   dcount=0
   dwc2_data=(
     $DWC2FK_DIR
-    $WEB_DWC2
+    $DWC_ENV_DIR
     $DWC2_DIR
-    $TORNADO_DIR1
-    $TORNADO_DIR2
   )
   #count+1 for each found data-item from array
   for dd in "${dwc2_data[@]}"
@@ -39,27 +50,47 @@ dwc2_status(){
     fi
   done
   if [ "$dcount" == "${#dwc2_data[*]}" ]; then
-    DWC2_STATUS="${green}Installed!${default}         "
+    DWC2_STATUS="${green}Installed!${default}      "
   elif [ "$dcount" == 0 ]; then
-    DWC2_STATUS="${red}Not installed!${default}     "
+    DWC2_STATUS="${red}Not installed!${default}  "
   else
-    DWC2_STATUS="${yellow}Incomplete!${default}        "
+    DWC2_STATUS="${yellow}Incomplete!${default}     "
+  fi
+}
+
+moonraker_status(){
+  mrcount=0
+  moonraker_data=(
+    SERVICE
+    $MOONRAKER_DIR
+    $MOONRAKER_ENV_DIR
+    $NGINX_CONFD/upstreams.conf
+    $NGINX_CONFD/common_vars.conf
+  )
+  #remove the "SERVICE" entry from the moonraker_data array if a moonraker service is installed
+  [ "$(systemctl list-units --full -all -t service --no-legend | grep -F "moonraker.service")" ] && unset moonraker_data[0]
+  #count+1 for each found data-item from array
+  for mrd in "${moonraker_data[@]}"
+  do
+    if [ -e $mrd ]; then
+      mrcount=$(expr $mrcount + 1)
+    fi
+  done
+  if [ "$mrcount" == "${#moonraker_data[*]}" ]; then
+    MOONRAKER_STATUS="${green}Installed!${default}      "
+  elif [ "$mrcount" == 0 ]; then
+    MOONRAKER_STATUS="${red}Not installed!${default}  "
+  else
+    MOONRAKER_STATUS="${yellow}Incomplete!${default}     "
   fi
 }
 
 mainsail_status(){
   mcount=0
   mainsail_data=(
-    $MAINSAIL_SERVICE1
-    $MAINSAIL_SERVICE2
     $MAINSAIL_DIR
-    #${HOME}/.klippy_api_key
-    #${HOME}/.moonraker_api_key
-    #${HOME}/moonraker-env
-    /etc/nginx/sites-available/mainsail
-    /etc/nginx/sites-enabled/mainsail
-    /etc/init.d/nginx
-    /etc/default/nginx
+    $NGINX_SA/mainsail
+    $NGINX_SE/mainsail
   )
   #count+1 for each found data-item from array
   for md in "${mainsail_data[@]}"
@@ -69,158 +100,390 @@ mainsail_status(){
     fi
   done
   if [ "$mcount" == "${#mainsail_data[*]}" ]; then
-    MAINSAIL_STATUS="${green}Installed!${default}         "
+    MAINSAIL_STATUS="${green}Installed!${default}      "
   elif [ "$mcount" == 0 ]; then
-    MAINSAIL_STATUS="${red}Not installed!${default}     "
+    MAINSAIL_STATUS="${red}Not installed!${default}  "
   else
-    MAINSAIL_STATUS="${yellow}Incomplete!${default}        "
+    MAINSAIL_STATUS="${yellow}Incomplete!${default}     "
   fi
 }
 
+fluidd_status(){
+  fcount=0
+  fluidd_data=(
+    $FLUIDD_DIR
+    $NGINX_SA/fluidd
+    $NGINX_SE/fluidd
+  )
+  #count+1 for each found data-item from array
+  for fd in "${fluidd_data[@]}"
+  do
+    if [ -e $fd ]; then
+      fcount=$(expr $fcount + 1)
+    fi
+  done
+  if [ "$fcount" == "${#fluidd_data[*]}" ]; then
+    FLUIDD_STATUS="${green}Installed!${default}      "
+  elif [ "$fcount" == 0 ]; then
+    FLUIDD_STATUS="${red}Not installed!${default}  "
+  else
+    FLUIDD_STATUS="${yellow}Incomplete!${default}     "
+  fi
+}
+
+octoprint_status(){
+  ocount=0
+  octoprint_data=(
+    $OCTOPRINT_DIR
+    $OCTOPRINT_CFG_DIR
+    $OCTOPRINT_SERVICE1
+    $OCTOPRINT_SERVICE2
+  )
+  #count+1 for each found data-item from array
+  for op in "${octoprint_data[@]}"
+  do
+    if [ -e $op ]; then
+      ocount=$(expr $ocount + 1)
+    fi
+  done
+  if [ "$ocount" == "${#octoprint_data[*]}" ]; then
+    OCTOPRINT_STATUS="${green}Installed!${default}      "
+  elif [ "$ocount" == 0 ]; then
+    OCTOPRINT_STATUS="${red}Not installed!${default}  "
+  else
+    OCTOPRINT_STATUS="${yellow}Incomplete!${default}     "
+  fi
+}
+
+klipperscreen_status(){
+  klsccount=0
+  klipperscreen_data=(
+    SERVICE
+    $KLIPPERSCREEN_DIR
+    $KLIPPERSCREEN_ENV_DIR
+  )
+  #remove the "SERVICE" entry from the klipperscreen_data array if a klipperscreen service is installed
+  [ "$(systemctl list-units --full -all -t service --no-legend | grep -F "KlipperScreen.service")" ] && unset klipperscreen_data[0]
+  #count+1 for each found data-item from array
+  for klscd in "${klipperscreen_data[@]}"
+  do
+    if [ -e $klscd ]; then
+      klsccount=$(expr $klsccount + 1)
+    fi
+  done
+  if [ "$klsccount" == "${#klipperscreen_data[*]}" ]; then
+    KLIPPERSCREEN_STATUS="${green}Installed!${default}      "
+  elif [ "$klsccount" == 0 ]; then
+    KLIPPERSCREEN_STATUS="${red}Not installed!${default}  "
+  else
+    KLIPPERSCREEN_STATUS="${yellow}Incomplete!${default}     "
+  fi
+}
+
+#############################################################
+#############################################################
+
+### reading the klipper branch the user is currently on
 read_branch(){
-  if [ -d $KLIPPER_DIR ] && [ -d $KLIPPER_DIR/.git ]; then
+  if [ -d $KLIPPER_DIR/.git ]; then
     cd $KLIPPER_DIR
-    GET_BRANCH=$(git branch -a | head -1 | cut -d " " -f5 | cut -d ")" -f1)
-    #if reading the branch gives an empty string
-    #we are on non-detached HEAD state on origin/master
-    #and need to set GET_BRANCH to make a non-empty string
-    if [ -z $GET_BRANCH ]; then
-      GET_BRANCH="origin/master"
+    GET_BRANCH="$(git branch | grep "*" | cut -d"*" -f2 | cut -d" " -f2)"
+    ### try to fix a detached HEAD state and read the correct branch from the output you get
+    if [ "$(echo $GET_BRANCH | grep "HEAD" )" ]; then
+      DETACHED_HEAD="true"
+      GET_BRANCH=$(git branch | grep "HEAD" | rev | cut -d" " -f1 | rev | cut -d")" -f1 | cut -d"/" -f2)
+      ### try to identify the branch when the HEAD was detached at a single commit
+      ### will only work if its either master, scurve-shaping or scurve-smoothing branch
+      if [[ $GET_BRANCH =~ [[:alnum:]] ]]; then
+        if [ "$(git branch -r --contains $GET_BRANCH | grep "master")" ]; then
+          GET_BRANCH="master"
+        elif [ "$(git branch -r --contains $GET_BRANCH | grep "scurve-shaping")" ]; then
+          GET_BRANCH="scurve-shaping"
+        elif [ "$(git branch -r --contains $GET_BRANCH | grep "scurve-smoothing")" ]; then
+          GET_BRANCH="scurve-smoothing"
+        fi
+      fi
     fi
   else
     GET_BRANCH=""
   fi
 }
 
+#prints the current klipper branch in the main menu
 print_branch(){
   read_branch
-  if [ "$GET_BRANCH" == "origin/master" ]; then
-    PRINT_BRANCH="${cyan}$GET_BRANCH${default}      "
-  elif [ "$GET_BRANCH" == "dmbutyugin/scurve-shaping" ]; then
-    PRINT_BRANCH="${cyan}scurve-shaping${default}     "
-  elif [ "$GET_BRANCH" == "dmbutyugin/scurve-smoothing" ]; then
-    PRINT_BRANCH="${cyan}scurve-smoothing${default}   "
-  elif [ "$GET_BRANCH" == "Arksine/work-web_server-20200131" ]; then
-    PRINT_BRANCH="${cyan}moonraker${default}          "
-  elif [ "$GET_BRANCH" == "Arksine/dev-moonraker-testing" ]; then
-    PRINT_BRANCH="${cyan}dev-moonraker${default}      "
+  if [ ! -z "$GET_BRANCH" ]; then
+    PRINT_BRANCH="$(printf "%-16s" "$GET_BRANCH")"
   else
-    PRINT_BRANCH="${red}----${default}               "
+    PRINT_BRANCH="${red}--------------${default}  "
   fi
 }
 
 read_local_klipper_commit(){
   if [ -d $KLIPPER_DIR ] && [ -d $KLIPPER_DIR/.git ]; then
     cd $KLIPPER_DIR
-    LOCAL_COMMIT=$(git rev-parse --short=8 HEAD)
+    LOCAL_COMMIT=$(git describe HEAD --always --tags | cut -d "-" -f 1,2)
   else
-    LOCAL_COMMIT=""
+    LOCAL_COMMIT=$NONE
   fi
 }
 
 read_remote_klipper_commit(){
   read_branch
-  if [ ! -z $GET_BRANCH ];then
-    REMOTE_COMMIT=$(git rev-parse --short=8 $GET_BRANCH)
+  if [ ! -z "$GET_BRANCH" ];then
+    if [ "$GET_BRANCH" = "origin/master" ] || [ "$GET_BRANCH" = "master" ]; then
+      git fetch origin -q
+      REMOTE_COMMIT=$(git describe origin/master --always --tags | cut -d "-" -f 1,2)
+    elif [ "$GET_BRANCH" = "scurve-shaping" ]; then
+      git fetch dmbutyugin scurve-shaping -q
+      REMOTE_COMMIT=$(git describe dmbutyugin/scurve-shaping --always --tags | cut -d "-" -f 1,2)
+    elif [ "$GET_BRANCH" = "scurve-smoothing" ]; then
+      git fetch dmbutyugin scurve-smoothing -q
+      REMOTE_COMMIT=$(git describe dmbutyugin/scurve-smoothing --always --tags | cut -d "-" -f 1,2)
+    fi
   else
-    REMOTE_COMMIT=""
+    REMOTE_COMMIT=$NONE
   fi
 }
 
 compare_klipper_versions(){
-  read_local_klipper_commit
-  read_remote_klipper_commit
-  #echo "Local: $LOCAL_COMMIT"
-  #echo "Remote: $REMOTE_COMMIT"
+  unset KLIPPER_UPDATE_AVAIL
+  read_local_klipper_commit && read_remote_klipper_commit
   if [ "$LOCAL_COMMIT" != "$REMOTE_COMMIT" ]; then
-    LOCAL_COMMIT="${yellow}$LOCAL_COMMIT${default}"
-    REMOTE_COMMIT="${green}$REMOTE_COMMIT${default}"
+    LOCAL_COMMIT="${yellow}$(printf "%-12s" "$LOCAL_COMMIT")${default}"
+    REMOTE_COMMIT="${green}$(printf "%-12s" "$REMOTE_COMMIT")${default}"
+    KLIPPER_UPDATE_AVAIL="true"
+    update_arr+=(update_klipper)
   else
-    LOCAL_COMMIT="${green}$LOCAL_COMMIT${default}"
-    REMOTE_COMMIT="${green}$REMOTE_COMMIT${default}"
+    LOCAL_COMMIT="${green}$(printf "%-12s" "$LOCAL_COMMIT")${default}"
+    REMOTE_COMMIT="${green}$(printf "%-12s" "$REMOTE_COMMIT")${default}"
+    KLIPPER_UPDATE_AVAIL="false"
+  fi
+  #if detached head was found, force the user with warn message to update klipper
+  if [ "$DETACHED_HEAD" == "true" ]; then
+    LOCAL_COMMIT="${red}$(printf "%-12s" "Need update!")${default}"
   fi
 }
 
+#############################################################
+#############################################################
+
 read_dwc2fk_versions(){
   if [ -d $DWC2FK_DIR ] && [ -d $DWC2FK_DIR/.git ]; then
     cd $DWC2FK_DIR
-    LOCAL_DWC2FK_COMMIT=$(git rev-parse --short=8 HEAD)
-    REMOTE_DWC2FK_COMMIT=$(git rev-parse --short=8 origin/master)
+    git fetch origin master -q
+    LOCAL_DWC2FK_COMMIT=$(git describe HEAD --always --tags | cut -d "-" -f 1,2)
+    REMOTE_DWC2FK_COMMIT=$(git describe origin/master --always --tags | cut -d "-" -f 1,2)
   else
-    LOCAL_DWC2FK_COMMIT=""
-    REMOTE_DWC2FK_COMMIT=""
+    LOCAL_DWC2FK_COMMIT=$NONE
+    REMOTE_DWC2FK_COMMIT=$NONE
   fi
 }
 
 compare_dwc2fk_versions(){
+  unset DWC2FK_UPDATE_AVAIL
   read_dwc2fk_versions
-  #echo "Local: $LOCAL_DWC2FK_COMMIT"
-  #echo "Remote: $REMOTE_DWC2FK_COMMIT"
   if [ "$LOCAL_DWC2FK_COMMIT" != "$REMOTE_DWC2FK_COMMIT" ]; then
-    LOCAL_DWC2FK_COMMIT="${yellow}$LOCAL_DWC2FK_COMMIT${default}"
-    REMOTE_DWC2FK_COMMIT="${green}$REMOTE_DWC2FK_COMMIT${default}"
+    LOCAL_DWC2FK_COMMIT="${yellow}$(printf "%-12s" "$LOCAL_DWC2FK_COMMIT")${default}"
+    REMOTE_DWC2FK_COMMIT="${green}$(printf "%-12s" "$REMOTE_DWC2FK_COMMIT")${default}"
+    DWC2FK_UPDATE_AVAIL="true"
+    update_arr+=(update_dwc2fk)
   else
-    LOCAL_DWC2FK_COMMIT="${green}$LOCAL_DWC2FK_COMMIT${default}"
-    REMOTE_DWC2FK_COMMIT="${green}$REMOTE_DWC2FK_COMMIT${default}"
+    LOCAL_DWC2FK_COMMIT="${green}$(printf "%-12s" "$LOCAL_DWC2FK_COMMIT")${default}"
+    REMOTE_DWC2FK_COMMIT="${green}$(printf "%-12s" "$REMOTE_DWC2FK_COMMIT")${default}"
+    DWC2FK_UPDATE_AVAIL="false"
   fi
 }
 
 read_local_dwc2_version(){
-  if [ -e $DWC2_DIR/web/version ]; then
-    DWC2_LOCAL_VER=$(head -n 1 $DWC2_DIR/web/version)
+  unset DWC2_VER_FOUND
+  if [ -e $DWC2_DIR/version ]; then
+    DWC2_VER_FOUND="true"
+    DWC2_LOCAL_VER=$(head -n 1 $DWC2_DIR/version)
   else
-    DWC2_LOCAL_VER=""
+    DWC2_VER_FOUND="false" && unset DWC2_LOCAL_VER
   fi
 }
 
 read_remote_dwc2_version(){
-  DWC2_REMOTE_VER=$(curl -s https://api.github.com/repositories/28820678/releases/latest | grep tag_name | cut -d'"' -f4)
+  #remote checks don't work without curl installed!
+  if [[ ! $(dpkg-query -f'${Status}' --show curl 2>/dev/null) = *\ installed ]]; then
+    DWC2_REMOTE_VER=$NONE
+  else
+    get_dwc2_ver
+    DWC2_REMOTE_VER=$DWC2_VERSION
+  fi
 }
 
 compare_dwc2_versions(){
-  read_local_dwc2_version
-  read_remote_dwc2_version
-  #echo "Local: $DWC2_LOCAL_VER"
-  #echo "Remote: $DWC2_REMOTE_VER"
-  if [ "$DWC2_LOCAL_VER" != "$DWC2_REMOTE_VER" ]; then
-    DWC2_LOCAL_VER="${yellow}$DWC2_LOCAL_VER${default}"
-    DWC2_REMOTE_VER="${green}$DWC2_REMOTE_VER${default}"
+  unset DWC2_UPDATE_AVAIL
+  read_local_dwc2_version && read_remote_dwc2_version
+  if [[ $DWC2_VER_FOUND = "true" ]] && [[ $DWC2_LOCAL_VER == $DWC2_REMOTE_VER ]]; then
+    #printf fits the string for displaying it in the ui to a total char length of 12
+    DWC2_LOCAL_VER="${green}$(printf "v%-11s" "$DWC2_LOCAL_VER")${default}"
+    DWC2_REMOTE_VER="${green}$(printf "v%-11s" "$DWC2_REMOTE_VER")${default}"
+  elif [[ $DWC2_VER_FOUND = "true" ]] && [[ $DWC2_LOCAL_VER != $DWC2_REMOTE_VER ]]; then
+    DWC2_LOCAL_VER="${yellow}$(printf "v%-11s" "$DWC2_LOCAL_VER")${default}"
+    DWC2_REMOTE_VER="${green}$(printf "v%-11s" "$DWC2_REMOTE_VER")${default}"
+    # set flag for the multi update function
+    DWC2_UPDATE_AVAIL="true" && update_arr+=(update_dwc2)
   else
-    DWC2_LOCAL_VER="${green}$DWC2_LOCAL_VER${default}"
-    DWC2_REMOTE_VER="${green}$DWC2_REMOTE_VER${default}"
+    DWC2_LOCAL_VER=$NONE
+    DWC2_REMOTE_VER="${green}$(printf "v%-11s" "$DWC2_REMOTE_VER")${default}"
+    DWC2_UPDATE_AVAIL="false"
+  fi
+}
+
+#############################################################
+#############################################################
+
+read_moonraker_versions(){
+  if [ -d $MOONRAKER_DIR ] && [ -d $MOONRAKER_DIR/.git ]; then
+    cd $MOONRAKER_DIR
+    git fetch origin master -q
+    LOCAL_MOONRAKER_COMMIT=$(git describe HEAD --always --tags | cut -d "-" -f 1,2)
+    REMOTE_MOONRAKER_COMMIT=$(git describe origin/master --always --tags | cut -d "-" -f 1,2)
+  else
+    LOCAL_MOONRAKER_COMMIT=$NONE
+    REMOTE_MOONRAKER_COMMIT=$NONE
+  fi
+}
+
+compare_moonraker_versions(){
+  unset MOONRAKER_UPDATE_AVAIL
+  read_moonraker_versions
+  if [ "$LOCAL_MOONRAKER_COMMIT" != "$REMOTE_MOONRAKER_COMMIT" ]; then
+    LOCAL_MOONRAKER_COMMIT="${yellow}$(printf "%-12s" "$LOCAL_MOONRAKER_COMMIT")${default}"
+    REMOTE_MOONRAKER_COMMIT="${green}$(printf "%-12s" "$REMOTE_MOONRAKER_COMMIT")${default}"
+    MOONRAKER_UPDATE_AVAIL="true"
+    update_arr+=(update_moonraker)
+  else
+    LOCAL_MOONRAKER_COMMIT="${green}$(printf "%-12s" "$LOCAL_MOONRAKER_COMMIT")${default}"
+    REMOTE_MOONRAKER_COMMIT="${green}$(printf "%-12s" "$REMOTE_MOONRAKER_COMMIT")${default}"
+    MOONRAKER_UPDATE_AVAIL="false"
   fi
 }
 
 read_local_mainsail_version(){
-  if [ -e $MAINSAIL_DIR/version ]; then
-    MAINSAIL_LOCAL_VER=$(head -n 1 $MAINSAIL_DIR/version)
+  unset MAINSAIL_VER_FOUND
+  MAINSAIL_APP_FILE=$(find $MAINSAIL_DIR/js -name "app.*.js" 2>/dev/null)
+  if [ ! -z $MAINSAIL_APP_FILE ]; then
+    MAINSAIL_LOCAL_VER=$(grep -o -E 'state:{packageVersion:.+' $MAINSAIL_APP_FILE | cut -d'"' -f2)
+    MAINSAIL_VER_FOUND="true"
   else
-    MAINSAIL_LOCAL_VER=""
+    MAINSAIL_VER_FOUND="false" && unset MAINSAIL_LOCAL_VER
   fi
 }
 
 read_remote_mainsail_version(){
-  get_mainsail_ver
-  MAINSAIL_REMOTE_VER=$MAINSAIL_VERSION
-}
-
-compare_mainsail_versions(){
-  read_local_mainsail_version
-  read_remote_mainsail_version
-  #echo "Local: $MAINSAIL_LOCAL_VER"
-  #echo "Remote: $MAINSAIL_REMOTE_VER"
-  if [ "$MAINSAIL_LOCAL_VER" != "$MAINSAIL_REMOTE_VER" ]; then
-    MAINSAIL_LOCAL_VER="${yellow}$MAINSAIL_LOCAL_VER${default}"
-    MAINSAIL_REMOTE_VER="${green}$MAINSAIL_REMOTE_VER${default}"
+  #remote checks don't work without curl installed!
+  if [[ ! $(dpkg-query -f'${Status}' --show curl 2>/dev/null) = *\ installed ]]; then
+    MAINSAIL_REMOTE_VER=$NONE
   else
-    MAINSAIL_LOCAL_VER="${green}$MAINSAIL_LOCAL_VER${default}"
-    MAINSAIL_REMOTE_VER="${green}$MAINSAIL_REMOTE_VER${default}"
+    get_mainsail_ver
+    MAINSAIL_REMOTE_VER=$MAINSAIL_VERSION
   fi
 }
 
+compare_mainsail_versions(){
+  unset MAINSAIL_UPDATE_AVAIL
+  read_local_mainsail_version && read_remote_mainsail_version
+  if [[ $MAINSAIL_VER_FOUND = "true" ]] && [[ $MAINSAIL_LOCAL_VER == $MAINSAIL_REMOTE_VER ]]; then
+    #printf fits the string for displaying it in the ui to a total char length of 12
+    MAINSAIL_LOCAL_VER="${green}$(printf "v%-11s" "$MAINSAIL_LOCAL_VER")${default}"
+    MAINSAIL_REMOTE_VER="${green}$(printf "v%-11s" "$MAINSAIL_REMOTE_VER")${default}"
+  elif [[ $MAINSAIL_VER_FOUND = "true" ]] && [[ $MAINSAIL_LOCAL_VER != $MAINSAIL_REMOTE_VER ]]; then
+    MAINSAIL_LOCAL_VER="${yellow}$(printf "v%-11s" "$MAINSAIL_LOCAL_VER")${default}"
+    MAINSAIL_REMOTE_VER="${green}$(printf "v%-11s" "$MAINSAIL_REMOTE_VER")${default}"
+    # set flag for the multi update function
+    MAINSAIL_UPDATE_AVAIL="true" && update_arr+=(update_mainsail)
+  else
+    MAINSAIL_LOCAL_VER=$NONE
+    MAINSAIL_REMOTE_VER="${green}$(printf "v%-11s" "$MAINSAIL_REMOTE_VER")${default}"
+    MAINSAIL_UPDATE_AVAIL="false"
+  fi
+}
+
+read_local_fluidd_version(){
+  unset FLUIDD_VER_FOUND
+  FLUIDD_APP_FILE=$(find $FLUIDD_DIR/js -name "app.*.js" 2>/dev/null)
+  if [ ! -z $FLUIDD_APP_FILE ]; then
+    FLUIDD_LOCAL_VER=$(grep -o -E '"version/setVersion",".+"' $FLUIDD_APP_FILE | cut -d'"' -f4)
+    FLUIDD_VER_FOUND="true"
+  else
+    FLUIDD_VER_FOUND="false" && unset FLUIDD_LOCAL_VER
+  fi
+}
+
+read_remote_fluidd_version(){
+  #remote checks don't work without curl installed!
+  if [[ ! $(dpkg-query -f'${Status}' --show curl 2>/dev/null) = *\ installed ]]; then
+    FLUIDD_REMOTE_VER=$NONE
+  else
+    get_fluidd_ver
+    FLUIDD_REMOTE_VER=$FLUIDD_VERSION
+  fi
+}
+
+compare_fluidd_versions(){
+  unset FLUIDD_UPDATE_AVAIL
+  read_local_fluidd_version && read_remote_fluidd_version
+  if [[ $FLUIDD_VER_FOUND = "true" ]] && [[ $FLUIDD_LOCAL_VER == $FLUIDD_REMOTE_VER ]]; then
+    #printf fits the string for displaying it in the ui to a total char length of 12
+    FLUIDD_LOCAL_VER="${green}$(printf "v%-11s" "$FLUIDD_LOCAL_VER")${default}"
+    FLUIDD_REMOTE_VER="${green}$(printf "v%-11s" "$FLUIDD_REMOTE_VER")${default}"
+  elif [[ $FLUIDD_VER_FOUND = "true" ]] && [[ $FLUIDD_LOCAL_VER != $FLUIDD_REMOTE_VER ]]; then
+    FLUIDD_LOCAL_VER="${yellow}$(printf "v%-11s" "$FLUIDD_LOCAL_VER")${default}"
+    FLUIDD_REMOTE_VER="${green}$(printf "v%-11s" "$FLUIDD_REMOTE_VER")${default}"
+    # set flag for the multi update function
+    FLUIDD_UPDATE_AVAIL="true" && update_arr+=(update_fluidd)
+  else
+    FLUIDD_LOCAL_VER=$NONE
+    FLUIDD_REMOTE_VER="${green}$(printf "v%-11s" "$FLUIDD_REMOTE_VER")${default}"
+    FLUIDD_UPDATE_AVAIL="false"
+  fi
+}
+
+read_klipperscreen_versions(){
+  if [ -d $KLIPPERSCREEN_DIR ] && [ -d $KLIPPERSCREEN_DIR/.git ]; then
+    cd $KLIPPERSCREEN_DIR
+    git fetch origin master -q
+    LOCAL_KLIPPERSCREEN_COMMIT=$(git describe HEAD --always --tags | cut -d "-" -f 1,2)
+    REMOTE_KLIPPERSCREEN_COMMIT=$(git describe origin/master --always --tags | cut -d "-" -f 1,2)
+  else
+    LOCAL_KLIPPERSCREEN_COMMIT=$NONE
+    REMOTE_KLIPPERSCREEN_COMMIT=$NONE
+  fi
+}
+
+compare_klipperscreen_versions(){
+  unset KLIPPERSCREEN_UPDATE_AVAIL
+  read_klipperscreen_versions
+  if [ "$LOCAL_KLIPPERSCREEN_COMMIT" != "$REMOTE_KLIPPERSCREEN_COMMIT" ]; then
+    LOCAL_KLIPPERSCREEN_COMMIT="${yellow}$(printf "%-12s" "$LOCAL_KLIPPERSCREEN_COMMIT")${default}"
+    REMOTE_KLIPPERSCREEN_COMMIT="${green}$(printf "%-12s" "$REMOTE_KLIPPERSCREEN_COMMIT")${default}"
+    KLIPPERSCREEN_UPDATE_AVAIL="true"
+    update_arr+=(update_klipperscreen)
+  else
+    LOCAL_KLIPPERSCREEN_COMMIT="${green}$(printf "%-12s" "$LOCAL_KLIPPERSCREEN_COMMIT")${default}"
+    REMOTE_KLIPPERSCREEN_COMMIT="${green}$(printf "%-12s" "$REMOTE_KLIPPERSCREEN_COMMIT")${default}"
+    KLIPPERSCREEN_UPDATE_AVAIL="false"
+  fi
+}
+
+#############################################################
+#############################################################
+
+#display this as placeholder if no version/commit could be fetched
+NONE="${red}$(printf "%-12s" "--------")${default}"
+
 ui_print_versions(){
+  unset update_arr
   compare_klipper_versions
   compare_dwc2fk_versions
   compare_dwc2_versions
+  compare_moonraker_versions
   compare_mainsail_versions
-}
+  compare_fluidd_versions
+  compare_klipperscreen_versions
+}

scripts/switch_branch.sh

@@ -1,7 +1,7 @@
-switch_to_origin(){
+switch_to_master(){
   cd $KLIPPER_DIR
   status_msg "Switching...Please wait ..."; echo
-  git fetch origin -q && git checkout origin/master -q
+  git fetch origin -q && git checkout master; echo
 }
 
 switch_to_scurve_shaping(){
@@ -10,7 +10,7 @@ switch_to_scurve_shaping(){
   if ! git remote | grep dmbutyugin -q; then
     git remote add dmbutyugin $DMBUTYUGIN_REPO
   fi
-  git fetch dmbutyugin -q && git checkout $BRANCH_SCURVE_SHAPING -q
+  git fetch dmbutyugin -q && git checkout scurve-shaping; echo
 }
 
 switch_to_scurve_smoothing(){
@@ -19,23 +19,5 @@ switch_to_scurve_smoothing(){
   if ! git remote | grep dmbutyugin -q; then
     git remote add dmbutyugin $DMBUTYUGIN_REPO
   fi
-  git fetch dmbutyugin -q && git checkout $BRANCH_SCURVE_SMOOTHING -q
-}
-
-switch_to_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_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
+  git fetch dmbutyugin -q && git checkout scurve-smoothing; echo
 }

scripts/ui.sh

@@ -1,154 +0,0 @@
-### set up some UI stuff
-
-#ui total width = 57 chars
-top_border(){
-  echo -e "/=======================================================\ "
-}
-
-bottom_border(){
-  echo -e "\=======================================================/"
-}
-
-hr(){
-  echo -e "|-------------------------------------------------------|"
-}
-
-quit_footer(){
-  hr
-  echo -e "|                        ${red}Q) Quit${default}                        | "
-  bottom_border
-}
-
-print_header(){
-  top_border
-  echo -e "|     $(title_msg "~~~~~~~~~~~~~~~~~ [ KIAUH ] ~~~~~~~~~~~~~~~~~")     |"
-  echo -e "|     $(title_msg "   Klipper Installation And Update Helper    ")     |"
-  echo -e "|     $(title_msg "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~")     |"
-  bottom_border
-}
-
-main_ui(){
-  top_border
-  echo -e "|     $(title_msg "~~~~~~~~~~~~~~~ [ Main Menu ] ~~~~~~~~~~~~~~~")     |"
-  hr
-  echo -e "|  0) [System status]  |                                |"
-  echo -e "|                      |    Klipper: $KLIPPER_STATUS|"
-  echo -e "|  1) [Install]        |     Branch: $PRINT_BRANCH|"
-  echo -e "|  2) [Update]         |                                |"
-  echo -e "|  3) [Remove]         |       DWC2: $DWC2_STATUS|"
-  echo -e "|                      |   Mainsail: $MAINSAIL_STATUS|"
-  echo -e "|  4) [Advanced]       |  Octoprint: #### WIP ####      |"
-  echo -e "|  5) [Backup]         |                                |"
-  quit_footer
-}
-
-install_ui(){
-  top_border
-  echo -e "|     $(title_msg "~~~~~~~~~~~ [ Installation Menu ] ~~~~~~~~~~~")     | "
-  hr
-  echo -e "|  You need this menu usually only for installing       | "
-  echo -e "|  all necessary dependencies for the various           | "
-  echo -e "|  functions on a completely fresh system.              | "
-  hr
-  echo -e "|  Firmware:             |                              | "
-  echo -e "|  1) [Klipper]          |                              | "
-  echo -e "|                        |                              | "
-  echo -e "|  Webinterface:         |                              | "
-  echo -e "|  2) [DWC2]             |                              | "
-  echo -e "|  3) [Mainsail]         |                              | "
-  echo -e "|                        |                              | "
-  quit_footer
-}
-
-update_ui(){
-  top_border
-  echo -e "|     $(title_msg "~~~~~~~~~~~~~~ [ Update Menu ] ~~~~~~~~~~~~~~")     | "
-  hr
-  echo -e "|  It's a good idea to check the following website      | "
-  echo -e "|  for important software changes to the config file    | "
-  echo -e "|  BEFORE updating your klipper installation:           | "
-  echo -e "|                                                       | "
-  echo -e "|  ${yellow}https://www.klipper3d.org/Config_Changes.html${default}        | "
-  bottom_border
-  top_border
-  echo -e "|  0) $BB4U_STATUS| "
-  hr
-  echo -e "|                        |  Local Vers:  | Remote Vers: | "
-  echo -e "|  Firmware:             |               |              | "
-  echo -e "|  1) [Klipper]          |  $(echo "$LOCAL_COMMIT")     | $(echo "$REMOTE_COMMIT")     | "
-  echo -e "|                        |               |              | "
-  echo -e "|  Webinterface:         |               |              | "
-  echo -e "|  2) [DWC2-for-Klipper] |  $(echo "$LOCAL_DWC2FK_COMMIT")     | $(echo "$REMOTE_DWC2FK_COMMIT")     | "
-  echo -e "|  3) [DWC2 Web UI]      |  $(echo "$DWC2_LOCAL_VER")        | $(echo "$DWC2_REMOTE_VER")        | "
-  echo -e "|  4) [Mainsail]         |  $(echo "$MAINSAIL_LOCAL_VER")       | $(echo "$MAINSAIL_REMOTE_VER")       | "
-  echo -e "|                        |               |              | "
-  quit_footer
-}
-
-remove_ui(){
-  top_border
-  echo -e "|     $(title_msg "~~~~~~~~~~~~~~ [ Remove Menu ] ~~~~~~~~~~~~~~")     | "
-  hr
-  echo -e "|  Files and directories which remain untouched:        | "
-  echo -e "|  --> ~/printer.cfg                                    | "
-  echo -e "|  --> ~/backup                                         | "
-  echo -e "|  You need remove them manually if you wish so.        | "
-  hr
-  echo -e "|  1) [Klipper]          |                              | "
-  echo -e "|  2) [DWC2-for-Klipper] |                              | "
-  echo -e "|  3) [Mainsail]         |                              | "
-  echo -e "|                        |                              | "
-  quit_footer
-}
-
-advanced_ui(){
-  top_border
-  echo -e "|     $(title_msg "~~~~~~~~~~~~~ [ Advanced Menu ] ~~~~~~~~~~~~~")     | "
-  hr
-  echo -e "|  1) [Switch Klipper version]                          | "
-  echo -e "|                                                       | "
-  echo -e "|  2) [Build Firmware]                                  | "
-  echo -e "|  3) [Flash MCU]                                       | "
-  echo -e "|  4) [Get Printer-ID]                                  | "
-  echo -e "|  5) [Write Printer-ID to printer.cfg]                 | "
-  echo -e "|  6) [Write DWC2-for-klipper config]                   | "
-  echo -e "|                                                       | "
-  echo -e "|  x) [Enable/Disable Octoprint service]                | "
-  echo -e "|                                                       | "
-quit_footer
-}
-
-backup_ui(){
-  top_border
-  echo -e "|     $(title_msg "~~~~~~~~~~~~~~ [ Backup Menu ] ~~~~~~~~~~~~~~")     | "
-  hr
-  echo -e "|                                                       | "
-  hr
-  echo -e "|  1) [        ]                                        | "
-  echo -e "|  2) [        ]                                        | "
-  echo -e "|  3) [        ]                                        | "
-  echo -e "|  4) [        ]                                        | "
-  echo -e "|  5) [        ]                                        | "
-  echo -e "|  6) [        ]                                        | "
-  echo -e "|  7) [        ]                                        | "
-  echo -e "|                                                       | "
-  quit_footer
-}
-
-switch_ui(){
-  top_border
-  echo -e "|     $(title_msg "~~~~~~~~~ [ Switch Klipper Branch ] ~~~~~~~~~")     |"
-  bottom_border
-  echo
-  echo -e " $(title_msg "Active branch: ")${green}$GET_BRANCH${default}"
-  echo
-  top_border
-  echo -e "|  1) [--> origin/master]                               | "
-  echo -e "|                                                       | "
-  echo -e "|  2) [--> scurve-shaping]                              | "
-  echo -e "|  3) [--> scurve-smoothing]                            | "
-  echo -e "|                                                       | "
-  echo -e "|  4) [--> moonraker]                                   | "
-  echo -e "|  5) [--> dev-moonraker]                               | "
-  quit_footer
-}

scripts/ui/advanced_menu.sh

@@ -0,0 +1,188 @@
+advanced_ui(){
+  top_border
+  echo -e "|     ${yellow}~~~~~~~~~~~~~ [ Advanced Menu ] ~~~~~~~~~~~~~${default}     | "
+  hr
+  echo -e "|  0) $OPRINT_SERVICE_STATUS| "
+  hr
+  echo -e "|                           |                           | "
+  echo -e "|  Klipper:                 |  System:                  | "
+  echo -e "|  1) [Switch Version]      |  6) [Change hostname]     | "
+  echo -e "|  2) [Rollback]            |                           | "
+  echo -e "|                           |  Extensions:              | "
+  echo -e "|  Firmware:                |  7) [Shell Command]       | "
+  echo -e "|  3) [Build only]          |                           | "
+  echo -e "|  4) [Build + Flash MCU]   |                           | "
+  echo -e "|  5) [Get Printer-USB]     |                           | "
+  echo -e "|                           |                           | "
+quit_footer
+}
+
+advanced_menu(){
+  print_header
+  print_msg && clear_msg
+  read_octoprint_service_status
+  advanced_ui
+  while true; do
+    read -p "${cyan}Perform action:${default} " action; echo
+    case "$action" in
+      0)
+        clear
+        print_header
+        toggle_octoprint_service
+        read_octoprint_service_status
+        print_msg && clear_msg
+        advanced_ui;;
+      1)
+        clear
+        print_header
+        switch_menu
+        print_msg && clear_msg
+        advanced_ui;;
+      2)
+        clear
+        print_header
+        load_klipper_state
+        print_msg && clear_msg
+        advanced_ui;;
+      3)
+        clear
+        print_header
+        unset BUILD_FIRMWARE && BUILD_FIRMWARE="true"
+        build_fw
+        print_msg && clear_msg
+        advanced_ui;;
+      4)
+        clear
+        print_header
+        unset FLASH_FIRMWARE && FLASH_FIRMWARE="true"
+        flash_routine
+        unset BUILD_FIRMWARE && BUILD_FIRMWARE="true"
+        build_fw
+        unset CONFIRM_FLASHING && CONFIRM_FLASHING="true"
+        flash_mcu
+        print_msg && clear_msg
+        advanced_ui;;
+      5)
+        clear
+        print_header
+        get_printer_usb
+        print_msg && clear_msg
+        advanced_ui;;
+      6)
+        clear
+        print_header
+        create_custom_hostname && set_hostname
+        print_msg && clear_msg
+        advanced_ui;;
+      7)
+        clear
+        print_header
+        setup_gcode_shell_command
+        print_msg && clear_msg
+        advanced_ui;;
+      Q|q)
+        clear; main_menu; break;;
+      *)
+        clear
+        print_header
+        print_unkown_cmd
+        print_msg && clear_msg
+        advanced_ui;;
+    esac
+  done
+  advanced_menu
+}
+
+#############################################################
+#############################################################
+
+switch_ui(){
+  top_border
+  echo -e "|     $(title_msg "~~~~~~~~~ [ Switch Klipper Branch ] ~~~~~~~~~")     |"
+  bottom_border
+  echo
+  echo -e " $(title_msg "Active Branch: ")${green}$GET_BRANCH${default}"
+  echo
+  top_border
+  echo -e "|                                                       | "
+  echo -e "|  KevinOConnor:                                        | "
+  echo -e "|  1) [--> master]                                      | "
+  echo -e "|                                                       | "
+  echo -e "|  dmbutyugin:                                          | "
+  echo -e "|  2) [--> scurve-shaping]                              | "
+  echo -e "|  3) [--> scurve-smoothing]                            | "
+  quit_footer
+}
+
+switch_menu(){
+  if [ -d $KLIPPER_DIR ]; then
+    read_branch
+    print_msg && clear_msg
+    switch_ui
+    while true; do
+      read -p "${cyan}Perform action:${default} " action; echo
+      case "$action" in
+        1)
+          clear
+          print_header
+          switch_to_master
+          read_branch
+          print_msg && clear_msg
+          switch_ui;;
+        2)
+          clear
+          print_header
+          switch_to_scurve_shaping
+          read_branch
+          print_msg && clear_msg
+          switch_ui;;
+        3)
+          clear
+          print_header
+          switch_to_scurve_smoothing
+          read_branch
+          print_msg && clear_msg
+          switch_ui;;
+        4)
+          clear
+          print_header
+          switch_to_moonraker
+          read_branch
+          print_msg && clear_msg
+          switch_ui;;
+        Q|q)
+          clear; advanced_menu; break;;
+        *)
+          clear
+          print_header
+          print_unkown_cmd
+          print_msg && clear_msg
+          switch_ui;;
+      esac
+    done
+  else
+    ERROR_MSG="No Klipper directory found! Download Klipper first!"
+  fi
+}
+
+#############################################################
+#############################################################
+
+rollback_ui(){
+  top_border
+  echo -e "|     $(title_msg "~~~~~~~~~~~~~ [ Rollback Menu ] ~~~~~~~~~~~~~")     | "
+  hr
+  echo -e "|  If serious errors occured after updating Klipper,    | "
+  echo -e "|  you can use this menu to return to the previously    | "
+  echo -e "|  used commit from which you have updated.             | "
+  bottom_border
+  top_border
+  echo -e "|  Active branch: ${green}$PRINT_BRANCH${default}                      | "
+  hr
+  echo -e "|  Currently on commit:                                 | "
+  echo -e "|  $CURR_UI                             | "
+  hr
+  echo -e "|  Commit last updated from:                            | "
+  echo -e "|  $PREV_UI                             | "
+  quit_footer
+}

scripts/ui/backup_menu.sh

@@ -0,0 +1,85 @@
+backup_ui(){
+  top_border
+  echo -e "|     $(title_msg "~~~~~~~~~~~~~~ [ Backup Menu ] ~~~~~~~~~~~~~~")     | "
+  hr
+  echo -e "|           ${yellow}Backup location: ~/kiauh-backups${default}            | "
+  hr
+  echo -e "|  Firmware:                                            | "
+  echo -e "|  1) [Klipper]                                         | "
+  echo -e "|                                                       | "
+  echo -e "|  Klipper API:                                         | "
+  echo -e "|  2) [Moonraker]                                       | "
+  echo -e "|                                                       | "
+  echo -e "|  Webinterface:                                        | "
+  echo -e "|  3) [Mainsail]                                        | "
+  echo -e "|  4) [Fluidd]                                          | "
+  echo -e "|  5) [DWC2 Web UI]                                     | "
+  echo -e "|  6) [OctoPrint]                                       | "
+  echo -e "|                                                       | "
+  echo -e "|  HDMI Screen:                                         | "
+  echo -e "|  7) [KlipperScreen]                                   | "
+  echo -e "|                                                       | "
+  quit_footer
+}
+
+backup_menu(){
+  print_header
+  print_msg && clear_msg
+  backup_ui
+  while true; do
+    read -p "${cyan}Perform action:${default} " action; echo
+    case "$action" in
+      1)
+        clear
+        print_header
+        backup_klipper
+        print_msg && clear_msg
+        backup_ui;;
+      2)
+        clear
+        print_header
+        backup_moonraker
+        print_msg && clear_msg
+        backup_ui;;
+      3)
+        clear
+        print_header
+        backup_mainsail
+        print_msg && clear_msg
+        backup_ui;;
+      4)
+        clear
+        print_header
+        backup_fluidd
+        print_msg && clear_msg
+        backup_ui;;
+      5)
+        clear
+        print_header
+        backup_dwc2
+        print_msg && clear_msg
+        backup_ui;;
+      6)
+        clear
+        print_header
+        backup_octoprint
+        print_msg && clear_msg
+        backup_ui;;
+      7)
+        clear
+        print_header
+        backup_klipperscreen
+        print_msg && clear_msg
+        backup_ui;;
+      Q|q)
+        clear; main_menu; break;;
+      *)
+        clear
+        print_header
+        print_unkown_cmd
+        print_msg && clear_msg
+        backup_ui;;
+    esac
+  done
+  backup_menu
+}

scripts/ui/general_ui.sh

@@ -0,0 +1,40 @@
+#ui total width = 57 chars
+top_border(){
+  echo -e "/=======================================================\ "
+}
+
+bottom_border(){
+  echo -e "\=======================================================/"
+}
+
+blank_line(){
+  echo -e "|                                                       | "
+}
+
+hr(){
+  echo -e "|-------------------------------------------------------|"
+}
+
+quit_footer(){
+  hr
+  echo -e "|                        ${red}Q) Quit${default}                        | "
+  bottom_border
+}
+
+print_header(){
+  top_border
+  echo -e "|     $(title_msg "~~~~~~~~~~~~~~~~~ [ KIAUH ] ~~~~~~~~~~~~~~~~~")     |"
+  echo -e "|     $(title_msg "   Klipper Installation And Update Helper    ")     |"
+  echo -e "|     $(title_msg "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~")     |"
+  bottom_border
+}
+
+kiauh_update_msg(){
+  top_border
+  echo -e "|  ${yellow}There is a newer version of this script available!${default}   | "
+  echo -e "|  ${yellow}Type 'update' if you want to update KIAUH now.${default}       | "
+  blank_line
+  echo -e "|  ${yellow}Check out the KIAUH changelog for important changes${default}  | "
+  echo -e "|  ${yellow}either to the script or the installable components!${default}  | "
+  bottom_border
+}

scripts/ui/install_menu.sh

@@ -0,0 +1,79 @@
+install_ui(){
+  top_border
+  echo -e "|     ${green}~~~~~~~~~~~ [ Installation Menu ] ~~~~~~~~~~~${default}     | "
+  hr
+  echo -e "|  You need this menu usually only for installing       | "
+  echo -e "|  all necessary dependencies for the various           | "
+  echo -e "|  functions on a completely fresh system.              | "
+  hr
+  echo -e "|  Firmware:             |  Webinterface:               | "
+  echo -e "|  1) [Klipper]          |  3) [DWC2]                   | "
+  echo -e "|                        |  4) [Mainsail]               | "
+  echo -e "|  Klipper API:          |  5) [Fluidd]                 | "
+  echo -e "|  2) [Moonraker]        |  6) [Octoprint]              | "
+  echo -e "|                        |                              | "
+  echo -e "|                        |  HDMI Screen                 | "
+  echo -e "|                        |  7) [KlipperScreen]          | "
+  quit_footer
+}
+
+install_menu(){
+  print_header
+  install_ui
+  while true; do
+    read -p "${cyan}Perform action:${default} " action; echo
+    case "$action" in
+      1)
+        clear
+        print_header
+        install_klipper
+        print_msg && clear_msg
+        install_ui;;
+      2)
+        clear
+        print_header
+        install_moonraker
+        print_msg && clear_msg
+        install_ui;;
+      3)
+        clear
+        print_header
+        install_dwc2
+        print_msg && clear_msg
+        install_ui;;
+      4)
+        clear
+        print_header
+        install_mainsail
+        print_msg && clear_msg
+        install_ui;;
+      5)
+        clear
+        print_header
+        install_fluidd
+        print_msg && clear_msg
+        install_ui;;
+      6)
+        clear
+        print_header
+        install_octoprint
+        print_msg && clear_msg
+        install_ui;;
+      7)
+        clear
+        print_header
+        install_klipperscreen
+        print_msg && clear_msg
+        install_ui;;
+      Q|q)
+        clear; main_menu; break;;
+      *)
+        clear
+        print_header
+        print_unkown_cmd
+        print_msg && clear_msg
+        install_ui;;
+    esac
+  done
+  install_menu
+}

scripts/ui/main_menu.sh

@@ -0,0 +1,90 @@
+main_ui(){
+  top_border
+  echo -e "|     $(title_msg "~~~~~~~~~~~~~~~ [ Main Menu ] ~~~~~~~~~~~~~~~")     |"
+  hr
+  echo -e "|  0) [Upload Log]     |       Klipper: $KLIPPER_STATUS|"
+  echo -e "|                      |        Branch: ${cyan}$PRINT_BRANCH${default}|"
+  echo -e "|  1) [Install]        |                                |"
+  echo -e "|  2) [Update]         |     Moonraker: $MOONRAKER_STATUS|"
+  echo -e "|  3) [Remove]         |                                |"
+  echo -e "|                      |          DWC2: $DWC2_STATUS|"
+  echo -e "|  4) [Advanced]       |        Fluidd: $FLUIDD_STATUS|"
+  echo -e "|  5) [Backup]         |      Mainsail: $MAINSAIL_STATUS|"
+  echo -e "|                      |     Octoprint: $OCTOPRINT_STATUS|"
+  echo -e "|                      |                                |"
+  echo -e "|  ${cyan}$KIAUH_VER${default}| KlipperScreen: $KLIPPERSCREEN_STATUS|"
+  quit_footer
+}
+
+print_kiauh_version(){
+  cd ${SRCDIR}/kiauh
+  KIAUH_VER=$(git describe HEAD --always --tags | cut -d "-" -f 1,2)
+  KIAUH_VER="$(printf "%-20s" "$KIAUH_VER")"
+}
+
+main_menu(){
+  print_header
+  #print KIAUH update msg if update available
+    if [ "$KIAUH_UPDATE_AVAIL" = "true" ]; then
+      kiauh_update_msg
+    fi
+  #check install status
+    print_kiauh_version
+    klipper_status
+    moonraker_status
+    dwc2_status
+    fluidd_status
+    mainsail_status
+    octoprint_status
+    klipperscreen_status
+    print_branch
+  print_msg && clear_msg
+  main_ui
+  while true; do
+    read -p "${cyan}Perform action:${default} " action; echo
+    case "$action" in
+      update)
+        clear
+        print_header
+        update_kiauh
+        print_msg && clear_msg
+        main_ui;;
+      0)
+        clear
+        print_header
+        upload_selection
+        print_msg && clear_msg
+        main_ui;;
+      1)
+        clear
+        install_menu
+        break;;
+      2)
+        clear
+        update_menu
+        break;;
+      3)
+        clear
+        remove_menu
+        break;;
+      4)
+        clear
+        advanced_menu
+        break;;
+      5)
+        clear
+        backup_menu
+        break;;
+      Q|q)
+        echo -e "${green}###### Happy printing! ######${default}"; echo
+        exit -1;;
+      *)
+        clear
+        print_header
+        print_unkown_cmd
+        print_msg && clear_msg
+        main_ui;;
+    esac
+  done
+  clear; main_menu
+}

scripts/ui/remove_menu.sh

@@ -0,0 +1,90 @@
+remove_ui(){
+  top_border
+  echo -e "|     ${red}~~~~~~~~~~~~~~ [ Remove Menu ] ~~~~~~~~~~~~~~${default}     | "
+  hr
+  echo -e "|  Files and directories which remain untouched:        | "
+  echo -e "|  --> ~/printer.cfg                                    | "
+  echo -e "|  --> ~/klipper_config                                 | "
+  echo -e "|  --> ~/kiauh-backups                                  | "
+  echo -e "|  You need remove them manually if you wish so.        | "
+  hr
+  echo -e "|  Firmware:             |  Webinterface:               | "
+  echo -e "|  1) [Klipper]          |  3) [DWC2]                   | "
+  echo -e "|                        |  4) [Mainsail]               | "
+  echo -e "|  Klipper API:          |  5) [Fluidd]                 | "
+  echo -e "|  2) [Moonraker]        |  6) [Octoprint]              | "
+  echo -e "|                        |                              | "
+  echo -e "|                        |  Webserver:                  | "
+  echo -e "|                        |  7) [Nginx]                  | "
+  echo -e "|                        |                              | "
+  echo -e "|                        |  HDMI Screen:                | "
+  echo -e "|                        |  8) [KlipperScreen]          | "
+  quit_footer
+}
+
+remove_menu(){
+  print_header
+  remove_ui
+  while true; do
+    read -p "${cyan}Perform action:${default} " action; echo
+    case "$action" in
+      1)
+        clear
+        print_header
+        remove_klipper
+        print_msg && clear_msg
+        remove_ui;;
+      2)
+        clear
+        print_header
+        remove_moonraker
+        print_msg && clear_msg
+        remove_ui;;
+      3)
+        clear
+        print_header
+        remove_dwc2
+        print_msg && clear_msg
+        remove_ui;;
+      4)
+        clear
+        print_header
+        remove_mainsail
+        print_msg && clear_msg
+        remove_ui;;
+      5)
+        clear
+        print_header
+        remove_fluidd
+        print_msg && clear_msg
+        remove_ui;;
+      6)
+        clear
+        print_header
+        remove_octoprint
+        print_msg && clear_msg
+        remove_ui;;
+      7)
+        clear
+        print_header
+        remove_nginx
+        print_msg && clear_msg
+        remove_ui;;
+      8)
+        clear
+        print_header
+        remove_klipperscreen
+        print_msg && clear_msg
+        remove_ui;;
+      Q|q)
+        clear; main_menu; break;;
+      *)
+        clear
+        print_header
+        print_unkown_cmd
+        print_msg && clear_msg
+        remove_ui;;
+    esac
+  done
+  remove_menu
+}

scripts/ui/update_menu.sh

@@ -0,0 +1,107 @@
+update_ui(){
+  top_border
+  echo -e "|     ${green}~~~~~~~~~~~~~~ [ Update Menu ] ~~~~~~~~~~~~~~${default}     | "
+  hr
+  echo -e "|  Check the following website for important software   | "
+  echo -e "|  changes to the config file before updating Klipper:  | "
+  echo -e "|                                                       | "
+  echo -e "|  ${yellow}https://www.klipper3d.org/Config_Changes.html${default}        | "
+  bottom_border
+  top_border
+  echo -e "|  0) $BB4U_STATUS| "
+  hr
+  echo -e "|  a) [Update all]       |  Local Vers:  | Remote Vers: | "
+  echo -e "|                        |               |              | "
+  echo -e "|  Firmware:             |               |              | "
+  echo -e "|  1) [Klipper]          |  $LOCAL_COMMIT | $REMOTE_COMMIT | "
+  echo -e "|                        |               |              | "
+  echo -e "|  Webinterface:         |---------------|--------------| "
+  echo -e "|  2) [DWC2-for-Klipper] |  $LOCAL_DWC2FK_COMMIT | $REMOTE_DWC2FK_COMMIT | "
+  echo -e "|  3) [DWC2 Web UI]      |  $DWC2_LOCAL_VER | $DWC2_REMOTE_VER | "
+  echo -e "|                        |---------------|--------------| "
+  echo -e "|  4) [Moonraker]        |  $LOCAL_MOONRAKER_COMMIT | $REMOTE_MOONRAKER_COMMIT | "
+  echo -e "|  5) [Mainsail]         |  $MAINSAIL_LOCAL_VER | $MAINSAIL_REMOTE_VER | "
+  echo -e "|  6) [Fluidd]           |  $FLUIDD_LOCAL_VER | $FLUIDD_REMOTE_VER | "
+  echo -e "|                        |               |              | "
+  echo -e "|  HDMI Screen:          |---------------|--------------| "
+  echo -e "|  7) [KlipperScreen]    |  $LOCAL_KLIPPERSCREEN_COMMIT | $REMOTE_KLIPPERSCREEN_COMMIT | "
+  quit_footer
+}
+
+update_menu(){
+  print_header
+  #compare versions
+    ui_print_versions
+  print_msg && clear_msg
+  read_bb4u_stat
+  update_ui
+  while true; do
+    read -p "${cyan}Perform action:${default} " action; echo
+    case "$action" in
+      0)
+        clear
+        print_header
+        toggle_backups
+        print_msg && clear_msg
+        update_ui;;
+      1)
+        clear
+        print_header
+        update_klipper && ui_print_versions
+        print_msg && clear_msg
+        update_ui;;
+      2)
+        clear
+        print_header
+        update_dwc2fk && ui_print_versions
+        print_msg && clear_msg
+        update_ui;;
+      3)
+        clear
+        print_header
+        update_dwc2 && ui_print_versions
+        print_msg && clear_msg
+        update_ui;;
+      4)
+        clear
+        print_header
+        update_moonraker && ui_print_versions
+        print_msg && clear_msg
+        update_ui;;
+      5)
+        clear
+        print_header
+        update_mainsail && ui_print_versions
+        print_msg && clear_msg
+        update_ui;;
+      6)
+        clear
+        print_header
+        update_fluidd && ui_print_versions
+        print_msg && clear_msg
+        update_ui;;
+      7)
+        clear
+        print_header
+        update_klipperscreen && ui_print_versions
+        print_msg && clear_msg
+        update_ui;;
+      a)
+        clear
+        print_header
+        update_all && ui_print_versions
+        print_msg && clear_msg
+        update_ui;;
+      Q|q)
+        clear; main_menu; break;;
+      *)
+        clear
+        print_header
+        print_unkown_cmd
+        print_msg && clear_msg
+        ui_print_versions
+        update_ui;;
+    esac
+  done
+  update_menu
+}

scripts/update.sh

@@ -1,77 +1,183 @@
-#TODO
-# - update the correct branch
-# - version checks before updating
+update_kiauh(){
+  if [ "$KIAUH_UPDATE_AVAIL" = "true" ]; then
+    status_msg "Updating KIAUH ..."
+    cd ${HOME}/kiauh
+    ### force reset kiauh before updating
+    git reset --hard
+    git pull && ok_msg "Update complete! Please restart KIAUH."
+    exit -1
+  fi
+}
 
-#WIP
-update_check(){
-  read_local_commit
-  read_remote_commit
+update_all(){
+  while true; do
+    if [ "${#update_arr[@]}" = "0" ]; then
+      CONFIRM_MSG="Everything is already up to date!"
+      echo; break
+    fi
+    echo
+    top_border
+    echo -e "|  The following installations will be updated:         |"
+    if [ "$KLIPPER_UPDATE_AVAIL" = "true" ]; then
+      echo -e "|  ${cyan}● Klipper${default}                                            |"
+    fi
+    if [ "$DWC2FK_UPDATE_AVAIL" = "true" ]; then
+      echo -e "|  ${cyan}● DWC2-for-Klipper-Socket${default}                            |"
+    fi
+    if [ "$DWC2_UPDATE_AVAIL" = "true" ]; then
+      echo -e "|  ${cyan}● Duet Web Control${default}                                   |"
+    fi
+    if [ "$MOONRAKER_UPDATE_AVAIL" = "true" ]; then
+      echo -e "|  ${cyan}● Moonraker${default}                                          |"
+    fi
+    if [ "$MAINSAIL_UPDATE_AVAIL" = "true" ]; then
+      echo -e "|  ${cyan}● Mainsail${default}                                           |"
+    fi
+    if [ "$FLUIDD_UPDATE_AVAIL" = "true" ]; then
+      echo -e "|  ${cyan}● Fluidd${default}                                             |"
+    fi
+    if [ "$KLIPPERSCREEN_UPDATE_AVAIL" = "true" ]; then
+      echo -e "|  ${cyan}● KlipperScreen${default}                                      |"
+    fi
+    bottom_border
+    if [ "${#update_arr[@]}" != "0" ]; then
+      read -p "${cyan}###### Do you want to proceed? (Y/n):${default} " yn
+      case "$yn" in
+        Y|y|Yes|yes|"")
+          for update in ${update_arr[@]}
+          do
+            $update
+          done
+          break;;
+        N|n|No|no)
+          break;;
+        *)
+          print_unkown_cmd
+          print_msg && clear_msg;;
+      esac
+    fi
+  done
 }
 
 update_klipper(){
   stop_klipper
-  bb4u_klipper
   if [ ! -d $KLIPPER_DIR ]; then
     cd ${HOME} && git clone $KLIPPER_REPO
   else
+    bb4u "klipper"
     read_branch
+    save_klipper_state
     status_msg "Updating $GET_BRANCH"
-    #fetching origin/master -> error
-    #rewriting origin/master to origin
-    if [ "$GET_BRANCH" == "origin/master" ]; then
-      FETCH_BRANCH="origin"
-    else
-      FETCH_BRANCH=$(echo "$GET_BRANCH" | cut -d "/" -f1)
+    cd $KLIPPER_DIR
+    if [ "$DETACHED_HEAD" == "true" ]; then
+      git checkout $GET_BRANCH
+      unset DETACHED_HEAD
     fi
-    status_msg "Fetching from $FETCH_BRANCH"
-    git fetch $FETCH_BRANCH -q && ok_msg "Fetch successfull!"
-    status_msg "Checking out $GET_BRANCH"
-    git checkout $GET_BRANCH -q && ok_msg "Checkout successfull!" && echo; ok_msg "Update complete!"
+    git pull && ok_msg "Update successfull!"
+
+    #check for possible new dependencies and install them
+    status_msg "Checking for possible new dependencies ..."
+    PKGLIST=$(grep "PKGLIST=" ~/klipper/scripts/install-octopi.sh | cut -d'"' -f2- | cut -d'"' -f1 | cut -d"}" -f2)
+    PYTHONDIR="${HOME}/klippy-env"
+    sudo apt-get update && sudo apt-get install --yes $PKGLIST
+    $PYTHONDIR/bin/pip install -r ~/klipper/scripts/klippy-requirements.txt
+    ok_msg "Dependencies already met or have been installed!"
+    ok_msg "Update complete!"
   fi
-  start_klipper; echo
+  start_klipper
 }
 
 update_dwc2fk(){
-  stop_klipper
-  bb4u_dwc2fk
+  stop_dwc
+  bb4u "dwc2"
   if [ ! -d $DWC2FK_DIR ]; then
     cd ${HOME} && git clone $DWC2FK_REPO
   else
     cd $DWC2FK_DIR && git pull
-    #create a web_dwc2.py symlink if not already existing
-    if [ -d $KLIPPER_DIR/klippy/extras ] && [ ! -e $WEB_DWC2 ]; then
-      status_msg "Creating web_dwc2.py symlink ..."
-      ln -s $DWC2FK_DIR/web_dwc2.py $WEB_DWC2 && ok_msg "Symlink created!"
-    fi
   fi
-  start_klipper
+  start_dwc
 }
 
 update_dwc2(){
-  bb4u_dwc2
-  #check dependencies
-  dep=(wget gzip tar curl)
-  dep_check
-  #execute operation
-  GET_DWC2_URL=`curl -s https://api.github.com/repositories/28820678/releases/latest | grep browser_download_url | cut -d'"' -f4`
-  if [ ! -d $DWC2_DIR/web ]; then
-    mkdir -p $DWC2_DIR/web
-  fi
-  cd $DWC2_DIR/web
-  status_msg "Downloading DWC2 Web UI ..."
-  wget -q $GET_DWC2_URL && ok_msg "Download complete!"
-  status_msg "Unzipping archive ..."
-  unzip -q -o *.zip && for f_ in $(find . | grep '.gz');do gunzip -f ${f_};done && ok_msg "Done!"
-  status_msg "Writing version to file ..."
-  echo $GET_DWC2_URL | cut -d/ -f8 > $DWC2_DIR/web/version && ok_msg "Done!"
-  status_msg "Do a little cleanup ..."
-  rm -rf DuetWebControl-SD.zip && ok_msg "Done!"
+  bb4u "dwc2"
+  download_dwc2_webui
 }
 
 update_mainsail(){
-  stop_klipper
-  bb4u_mainsail
+  bb4u "mainsail"
   status_msg "Updating Mainsail ..."
-  install_mainsail
-  start_klipper
-}
+  mainsail_setup
+}
+
+update_fluidd(){
+  bb4u "fluidd"
+  status_msg "Updating Fluidd ..."
+  fluidd_setup
+}
+
+update_moonraker(){
+  bb4u "moonraker"
+  status_msg "Updating Moonraker ..."
+  while true; do
+    echo
+    top_border
+    echo -e "| You can now choose how you want to update Moonraker.  |"
+    blank_line
+    echo -e "| Changes made to the Moonraker code and/or its depen-  |"
+    echo -e "| dencies might require a rebuild of the python virtual |"
+    echo -e "| environment or downloading of additional packages.    |"
+    blank_line
+    echo -e "| ${red}Check the docs in the Moonraker repository to see if${default}  |"
+    echo -e "| ${red}rebuilding is necessary (user_changes.md)!${default}            |"
+    blank_line
+    echo -e "| 1) Update Moonraker (default)                         |"
+    echo -e "| 2) Update Moonraker + rebuild virtualenv/dependencies |"
+    quit_footer
+    read -p "${cyan}###### Please choose:${default} " action
+    case "$action" in
+      1|"")
+        echo -e "###### > Update Moonraker"
+        update_mr="true" && rebuild_env="false"
+        break;;
+      2)
+        echo -e "###### > Update Moonraker + rebuild virtualenv/dependencies"
+        update_mr="true" && rebuild_env="true"
+        break;;
+      Q|q)
+        clear; update_menu; break;;
+      *)
+        print_unkown_cmd
+        print_msg && clear_msg;;
+    esac
+  done
+  stop_moonraker; echo
+  if [[ $update_mr = "true" ]] && [[ $rebuild_env = "false" ]]; then
+    unset update_mr && unset rebuild_env
+    cd $MOONRAKER_DIR && git pull
+  fi
+  if [[ $update_mr = "true" ]] && [[ $rebuild_env = "true" ]]; then
+    unset update_mr && unset rebuild_env
+    cd $MOONRAKER_DIR && git pull && ./scripts/install-moonraker.sh -r
+  fi
+  #read printer.cfg location and patch /etc/default/klipper if entries don't match
+  locate_printer_cfg && patch_klipper_sysfile
+  ok_msg "Update complete!"
+  restart_moonraker
+}
+
+update_klipperscreen(){
+  stop_klipperscreen
+  cd $KLIPPERSCREEN_DIR
+  KLIPPERSCREEN_OLDREQ_MD5SUM=$(md5sum $KLIPPERSCREEN_DIR/scripts/KlipperScreen-requirements.txt | cut -d " " -f1)
+  git pull origin master -q && ok_msg "Fetch successfull!"
+  git checkout -f origin/master && ok_msg "Checkout successfull"
+  #KLIPPERSCREEN_NEWREQ_MD5SUM=$(md5sum $KLIPPERSCREEN_DIR/scripts/KlipperScreen-requirements.txt)
+  if [[ $(md5sum $KLIPPERSCREEN_DIR/scripts/KlipperScreen-requirements.txt | cut -d " " -f1) != $KLIPPERSCREEN_OLDREQ_MD5SUM ]]; then
+    status_msg "New dependecies detected..."
+    PYTHONDIR="${HOME}/.KlipperScreen-env"
+    $PYTHONDIR/bin/pip install -r $KLIPPERSCREEN_DIR/scripts/KlipperScreen-requirements.txt
+    ok_msg "Dependencies have been installed!"
+  fi
+  ok_msg "Update complete!"
+  start_klipperscreen
+}

scripts/upload_log.sh

@@ -0,0 +1,89 @@
+accept_upload_conditions(){
+  while true; do
+    top_border
+    echo -e "|     ${red}~~~~~~~~~~~ [ Upload Agreement ] ~~~~~~~~~~~~${default}     |"
+    hr
+    echo -e "| The following function will help to quickly upload    |"
+    echo -e "| logs for debugging purposes. With confirming this     |"
+    echo -e "| dialog, you agree that during that process your logs  |"
+    echo -e "| will be uploaded to: ${yellow}http://paste.c-net.org/${default}          |"
+    hr
+    echo -e "| ${red}PLEASE NOTE:${default}                                          |"
+    echo -e "| Be aware that logs can contain network information,   |"
+    echo -e "| private data like usernames, filenames, or other      |"
+    echo -e "| information you may not want to make public.          |"
+    blank_line
+    echo -e "| Do ${red}NOT${default} use this function if you don't agree!          |"
+    bottom_border
+    read -p "${cyan}Do you accept? (Y/n):${default} " yn
+    case "$yn" in
+      Y|y|Yes|yes|"")
+        sed -i "/logupload_accepted=/s/false/true/" $INI_FILE
+        clear && print_header && upload_selection
+        ;;
+      N|n|No|no)
+        clear
+        main_menu
+        break
+        ;;
+      *)
+        clear
+        print_header
+        print_unkown_cmd
+        print_msg && clear_msg
+        accept_upload_conditions;;
+    esac
+  done
+}
+
+upload_selection(){
+  source_ini
+  [ "$logupload_accepted" = "false" ] && accept_upload_conditions
+  KLIPPY_LOG=/tmp/klippy.log
+  MOONRAKER_LOG=/tmp/moonraker.log
+  DWC2_LOG=/tmp/dwc2.log
+  top_border
+  echo -e "|     ${yellow}~~~~~~~~~~~~~~~ [ Log Upload ] ~~~~~~~~~~~~~~${default}     |"
+  hr
+  echo -e "|  You can choose the following files for uploading:    |"
+  echo -e "|  1) klippy.log                                        |"
+  echo -e "|  2) moonraker.log                                     |"
+  echo -e "|  3) dwc2.log                                          |"
+  quit_footer
+  while true; do
+    read -p "${cyan}Please select:${default} " choice
+    case "$choice" in
+    1)
+      clear && print_header
+      upload_log "$KLIPPY_LOG"
+      upload_selection
+      ;;
+    2)
+      clear && print_header
+      upload_log "$MOONRAKER_LOG"
+      upload_selection
+      ;;
+    3)
+      clear && print_header
+      upload_log "$DWC2_LOG"
+      upload_selection
+      ;;
+    q | Q) clear; main_menu; break;;
+    esac
+  done
+}
+
+upload_log(){
+  if [ -f "$1" ]; then
+    status_msg "Uploading $1 ..."
+    LINK=$(curl -s --upload-file $1 'http://paste.c-net.org/')
+    [ ! -z "$LINK" ] && ok_msg "$1 upload successfull!"
+    echo -e "\n${cyan}###### Here is your link:${default}"
+    echo -e ">>>>>> $LINK\n"
+    unset LINK
+  else
+    clear && print_header
+    ERROR_MSG="$1 not found!" && print_msg && clear_msg
+    upload_selection
+  fi
+}