scripts/constants/constants.sh

@@ -1,52 +1,50 @@
+#!/bin/bash
 ### set important directories
 
 #kiauh.sh
 #klipper
-KLIPPER_DIR=${HOME}/klipper
-KLIPPY_ENV=${HOME}/klippy-env
+readonly KLIPPER_DIR=${HOME}/klipper
+readonly KLIPPY_ENV=${HOME}/klippy-env
 #nginx
-NGINX_SA=/etc/nginx/sites-available
-NGINX_SE=/etc/nginx/sites-enabled
-NGINX_CONFD=/etc/nginx/conf.d
+readonly NGINX_SA=/etc/nginx/sites-available
+readonly NGINX_SE=/etc/nginx/sites-enabled
+readonly NGINX_CONFD=/etc/nginx/conf.d
 #moonraker
-MOONRAKER_DIR=${HOME}/moonraker
-MOONRAKER_ENV=${HOME}/moonraker-env
+readonly MOONRAKER_DIR=${HOME}/moonraker
+readonly MOONRAKER_ENV=${HOME}/moonraker-env
 #mainsail
-MAINSAIL_DIR=${HOME}/mainsail
+readonly MAINSAIL_DIR=${HOME}/mainsail
 #fluidd
-FLUIDD_DIR=${HOME}/fluidd
+readonly FLUIDD_DIR=${HOME}/fluidd
 #dwc2
-DWC2FK_DIR=${HOME}/dwc2-for-klipper-socket
-DWC_ENV_DIR=${HOME}/dwc-env
-DWC2_DIR=${HOME}/duetwebcontrol
+readonly DWC2FK_DIR=${HOME}/dwc2-for-klipper-socket
+readonly DWC_ENV_DIR=${HOME}/dwc-env
+readonly DWC2_DIR=${HOME}/duetwebcontrol
 #octoprint
-OCTOPRINT_DIR=${HOME}/OctoPrint
+readonly OCTOPRINT_DIR=${HOME}/OctoPrint
 #KlipperScreen
-KLIPPERSCREEN_DIR=${HOME}/KlipperScreen
-KLIPPERSCREEN_ENV_DIR=${HOME}/.KlipperScreen-env
+readonly KLIPPERSCREEN_DIR=${HOME}/KlipperScreen
+readonly KLIPPERSCREEN_ENV_DIR=${HOME}/.KlipperScreen-env
 #MoonrakerTelegramBot
-MOONRAKER_TELEGRAM_BOT_DIR=${HOME}/moonraker-telegram-bot
-MOONRAKER_TELEGRAM_BOT_ENV_DIR=${HOME}/moonraker-telegram-bot-env
+readonly MOONRAKER_TELEGRAM_BOT_DIR=${HOME}/moonraker-telegram-bot
+readonly MOONRAKER_TELEGRAM_BOT_ENV_DIR=${HOME}/moonraker-telegram-bot-env
 #misc
-INI_FILE=${HOME}/.kiauh.ini
-BACKUP_DIR=${HOME}/kiauh-backups
+readonly INI_FILE=${HOME}/.kiauh.ini
+readonly BACKUP_DIR=${HOME}/kiauh-backups
+readonly SYSTEMDDIR=/etc/systemd/system
 
 ### set github repos
-KLIPPER_REPO=https://github.com/Klipper3d/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
-KLIPPERSCREEN_REPO=https://github.com/jordanruthe/KlipperScreen.git
-NLEF_REPO=https://github.com/nlef/moonraker-telegram-bot.git
+readonly KLIPPER_REPO=https://github.com/Klipper3d/klipper.git
+readonly ARKSINE_REPO=https://github.com/Arksine/klipper.git
+readonly DMBUTYUGIN_REPO=https://github.com/dmbutyugin/klipper.git
+readonly DWC2FK_REPO=https://github.com/Stephan3/dwc2-for-klipper-socket.git
+readonly KLIPPERSCREEN_REPO=https://github.com/jordanruthe/KlipperScreen.git
+readonly NLEF_REPO=https://github.com/nlef/moonraker-telegram-bot.git
 #branches
-BRANCH_SCURVE_SMOOTHING=dmbutyugin/scurve-smoothing
-BRANCH_SCURVE_SHAPING=dmbutyugin/scurve-shaping
+readonly BRANCH_SCURVE_SMOOTHING=dmbutyugin/scurve-smoothing
+readonly BRANCH_SCURVE_SHAPING=dmbutyugin/scurve-shaping
 
 ###Whiptail
-KIAUH_WHIPTAIL_WIDTH=96
-KIAUH_WHIPTAIL_HEIGHT=25
-
-#functions.sh
-### base variables
-SYSTEMDDIR="/etc/systemd/system"
-
+readonly KIAUH_WHIPTAIL_NORMAL_WIDTH=70
+readonly KIAUH_WHIPTAIL_NORMAL_HEIGHT=24
+readonly KIAUH_WHIPTAIL_SINGLE_LINE_HEIGHT=7

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

@@ -5,7 +5,6 @@
 # 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

scripts/install_dwc2.sh

@@ -1,5 +1,4 @@
 ### base variables
-SYSTEMDDIR="/etc/systemd/system"
 DWC_ENV="${HOME}/dwc-env"
 DWC2_DIR="${HOME}/duetwebcontrol"
 

scripts/install_klipper.sh

@@ -1,5 +1,4 @@
 ### base variables
-SYSTEMDDIR="/etc/systemd/system"
 KLIPPY_ENV="${HOME}/klippy-env"
 KLIPPER_DIR="${HOME}/klipper"
 

scripts/install_mjpg-streamer.sh

@@ -1,5 +1,4 @@
 ### base variables
-SYSTEMDDIR="/etc/systemd/system"
 WEBCAMD_SRC="https://raw.githubusercontent.com/raymondh2/MainsailOS/master/src/modules/mjpgstreamer/filesystem/root/usr/local/bin/webcamd"
 WEBCAM_TXT_SRC="https://raw.githubusercontent.com/raymondh2/MainsailOS/master/src/modules/mjpgstreamer/filesystem/home/pi/klipper_config/webcam.txt"
 

scripts/install_moonraker.sh

@@ -1,5 +1,4 @@
 ### base variables
-SYSTEMDDIR="/etc/systemd/system"
 MOONRAKER_ENV="${HOME}/moonraker-env"
 MOONRAKER_DIR="${HOME}/moonraker"
 MOONRAKER_REPO="https://github.com/Arksine/moonraker.git"

scripts/install_octoprint.sh

@@ -1,5 +1,4 @@
 ### base variables
-SYSTEMDDIR="/etc/systemd/system"
 OCTOPRINT_ENV="${HOME}/OctoPrint"
 
 octoprint_setup_dialog(){

scripts/ms_theme_installer.sh

@@ -1,5 +1,4 @@
 ### base variables
-SYSTEMDDIR="/etc/systemd/system"
 
 get_theme_list(){
   theme_csv_url="https://raw.githubusercontent.com/meteyou/mainsail/develop/docs/_data/themes.csv"

scripts/remove.sh

@@ -1,6 +1,3 @@
-### base variables
-SYSTEMDDIR="/etc/systemd/system"
-
 remove_klipper(){
   shopt -s extglob # enable extended globbing
   ### ask the user if he wants to uninstall moonraker too.