diff --git a/scripts/backup.sh b/scripts/backup.sh index cde6557..ffa6158 100755 --- a/scripts/backup.sh +++ b/scripts/backup.sh @@ -13,7 +13,7 @@ set -e ### global variables BACKUP_DIR="${HOME}/kiauh-backups" -KLIPPER_CONFIG="${HOME}/klipper_config" +KLIPPER_CONFIG="$(get_klipper_cfg_dir)" function get_date(){ current_date=$(date +"%y%m%d-%H%M") diff --git a/scripts/fluidd.sh b/scripts/fluidd.sh index fb6e27c..a15bd31 100644 --- a/scripts/fluidd.sh +++ b/scripts/fluidd.sh @@ -14,7 +14,7 @@ set -e ### global variables FLUIDD_DIR="${HOME}/fluidd" FLUIDD_REPO_API="https://api.github.com/repos/fluidd-core/fluidd/releases" -KLIPPER_CONFIG="${HOME}/klipper_config" +KLIPPER_CONFIG="$(get_klipper_cfg_dir)" #===================================================# #================== INSTALL FLUIDD =================# diff --git a/scripts/klipper.sh b/scripts/klipper.sh index 34acdbc..7c4f642 100644 --- a/scripts/klipper.sh +++ b/scripts/klipper.sh @@ -18,7 +18,7 @@ ETCDEF="/etc/default" KLIPPY_ENV="${HOME}/klippy-env" KLIPPER_DIR="${HOME}/klipper" KLIPPER_REPO="https://github.com/Klipper3d/klipper.git" -KLIPPER_CONFIG="${HOME}/klipper_config" +KLIPPER_CONFIG="$(get_klipper_cfg_dir)" #=================================================# #================ INSTALL KLIPPER ================# @@ -396,4 +396,19 @@ function compare_klipper_versions(){ KLIPPER_UPDATE_AVAIL="false" fi echo "${versions}" +} + +#================================================# +#=================== HELPERS ====================# +#================================================# + +function get_klipper_cfg_dir() { + local cfg_dir + read_kiauh_ini + if [ -z "${custom_klipper_cfg_loc}" ]; then + cfg_dir="${HOME}/klipper_config" + else + cfg_dir="${custom_klipper_cfg_loc}" + fi + echo "${cfg_dir}" } \ No newline at end of file diff --git a/scripts/klipperscreen.sh b/scripts/klipperscreen.sh index 8e9bcad..f05e40f 100644 --- a/scripts/klipperscreen.sh +++ b/scripts/klipperscreen.sh @@ -16,7 +16,7 @@ SYSTEMD="/etc/systemd/system" KLIPPERSCREEN_ENV_DIR="${HOME}/.KlipperScreen-env" KLIPPERSCREEN_DIR="${HOME}/KlipperScreen" KLIPPERSCREEN_REPO=https://github.com/jordanruthe/KlipperScreen.git -KLIPPER_CONFIG="${HOME}/klipper_config" +KLIPPER_CONFIG="$(get_klipper_cfg_dir)" #===================================================# #============== INSTALL KLIPPERSCREEN ==============# diff --git a/scripts/mainsail.sh b/scripts/mainsail.sh index 2da3b97..f18e184 100644 --- a/scripts/mainsail.sh +++ b/scripts/mainsail.sh @@ -15,7 +15,7 @@ set -e MAINSAIL_DIR="${HOME}/mainsail" MAINSAIL_REPO_API="https://api.github.com/repos/mainsail-crew/mainsail/releases" MAINSAIL_TAGS="https://api.github.com/repos/mainsail-crew/mainsail/tags" -KLIPPER_CONFIG="${HOME}/klipper_config" +KLIPPER_CONFIG="$(get_klipper_cfg_dir)" #===================================================# #================= INSTALL MAINSAIL ================# diff --git a/scripts/moonraker-telegram-bot.sh b/scripts/moonraker-telegram-bot.sh index 1001f67..080b5e0 100644 --- a/scripts/moonraker-telegram-bot.sh +++ b/scripts/moonraker-telegram-bot.sh @@ -16,7 +16,7 @@ SYSTEMD="/etc/systemd/system" MOONRAKER_TELEGRAM_BOT_ENV_DIR=${HOME}/moonraker-telegram-bot-env MOONRAKER_TELEGRAM_BOT_DIR=${HOME}/moonraker-telegram-bot NLEF_REPO=https://github.com/nlef/moonraker-telegram-bot.git -KLIPPER_CONFIG="${HOME}/klipper_config" +KLIPPER_CONFIG="$(get_klipper_cfg_dir)" #===================================================# #=========== REMOVE MOONRAKERTELEGRAMBOT ===========# diff --git a/scripts/ui/settings_menu.sh b/scripts/ui/settings_menu.sh index 1f989d6..27697f9 100755 --- a/scripts/ui/settings_menu.sh +++ b/scripts/ui/settings_menu.sh @@ -13,7 +13,7 @@ set -e ### global variables INI_FILE="${HOME}/.kiauh.ini" -KLIPPER_CONFIG="${HOME}/klipper_config" +KLIPPER_CONFIG="$(get_klipper_cfg_dir)" function settings_ui() { read_kiauh_ini