h3n3/kiauh
1
0
Fork 0
Code Issues 46 Pull Requests 10 Packages Projects Releases Wiki Activity

feat: read custom klipper config location from file

Browse Source 
Signed-off-by: Dominik Willner th33xitus@gmail.com
This commit is contained in:
th33xitus
2022-04-05 11:40:29 +02:00
parent 2ad1ec5573
commit 114684030b
7 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/backup.sh
View File

@@ -13,7 +13,7 @@ set -e
### global variables ### global variables
BACKUP_DIR="${HOME}/kiauh-backups" BACKUP_DIR="${HOME}/kiauh-backups"
KLIPPER_CONFIG="${HOME}/klipper_config" KLIPPER_CONFIG="$(get_klipper_cfg_dir)"
function get_date(){ function get_date(){
current_date=$(date +"%y%m%d-%H%M") current_date=$(date +"%y%m%d-%H%M")

2
scripts/fluidd.sh
View File

@@ -14,7 +14,7 @@ set -e
### global variables ### global variables
FLUIDD_DIR="${HOME}/fluidd" FLUIDD_DIR="${HOME}/fluidd"
FLUIDD_REPO_API="https://api.github.com/repos/fluidd-core/fluidd/releases" 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 =================# #================== INSTALL FLUIDD =================#

17
scripts/klipper.sh
View File

@@ -18,7 +18,7 @@ ETCDEF="/etc/default"
KLIPPY_ENV="${HOME}/klippy-env" KLIPPY_ENV="${HOME}/klippy-env"
KLIPPER_DIR="${HOME}/klipper" KLIPPER_DIR="${HOME}/klipper"
KLIPPER_REPO="https://github.com/Klipper3d/klipper.git" KLIPPER_REPO="https://github.com/Klipper3d/klipper.git"
KLIPPER_CONFIG="${HOME}/klipper_config" KLIPPER_CONFIG="$(get_klipper_cfg_dir)"
#=================================================# #=================================================#
#================ INSTALL KLIPPER ================# #================ INSTALL KLIPPER ================#
@@ -397,3 +397,18 @@ function compare_klipper_versions(){
fi fi
echo "${versions}" 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}"
}

2
scripts/klipperscreen.sh
View File

@@ -16,7 +16,7 @@ SYSTEMD="/etc/systemd/system"
KLIPPERSCREEN_ENV_DIR="${HOME}/.KlipperScreen-env" KLIPPERSCREEN_ENV_DIR="${HOME}/.KlipperScreen-env"
KLIPPERSCREEN_DIR="${HOME}/KlipperScreen" KLIPPERSCREEN_DIR="${HOME}/KlipperScreen"
KLIPPERSCREEN_REPO=https://github.com/jordanruthe/KlipperScreen.git KLIPPERSCREEN_REPO=https://github.com/jordanruthe/KlipperScreen.git
KLIPPER_CONFIG="${HOME}/klipper_config" KLIPPER_CONFIG="$(get_klipper_cfg_dir)"
#===================================================# #===================================================#
#============== INSTALL KLIPPERSCREEN ==============# #============== INSTALL KLIPPERSCREEN ==============#

2
scripts/mainsail.sh
View File

@@ -15,7 +15,7 @@ set -e
MAINSAIL_DIR="${HOME}/mainsail" MAINSAIL_DIR="${HOME}/mainsail"
MAINSAIL_REPO_API="https://api.github.com/repos/mainsail-crew/mainsail/releases" MAINSAIL_REPO_API="https://api.github.com/repos/mainsail-crew/mainsail/releases"
MAINSAIL_TAGS="https://api.github.com/repos/mainsail-crew/mainsail/tags" MAINSAIL_TAGS="https://api.github.com/repos/mainsail-crew/mainsail/tags"
KLIPPER_CONFIG="${HOME}/klipper_config" KLIPPER_CONFIG="$(get_klipper_cfg_dir)"
#===================================================# #===================================================#
#================= INSTALL MAINSAIL ================# #================= INSTALL MAINSAIL ================#

2
scripts/moonraker-telegram-bot.sh
View File

@@ -16,7 +16,7 @@ SYSTEMD="/etc/systemd/system"
MOONRAKER_TELEGRAM_BOT_ENV_DIR=${HOME}/moonraker-telegram-bot-env MOONRAKER_TELEGRAM_BOT_ENV_DIR=${HOME}/moonraker-telegram-bot-env
MOONRAKER_TELEGRAM_BOT_DIR=${HOME}/moonraker-telegram-bot MOONRAKER_TELEGRAM_BOT_DIR=${HOME}/moonraker-telegram-bot
NLEF_REPO=https://github.com/nlef/moonraker-telegram-bot.git NLEF_REPO=https://github.com/nlef/moonraker-telegram-bot.git
KLIPPER_CONFIG="${HOME}/klipper_config" KLIPPER_CONFIG="$(get_klipper_cfg_dir)"
#===================================================# #===================================================#
#=========== REMOVE MOONRAKERTELEGRAMBOT ===========# #=========== REMOVE MOONRAKERTELEGRAMBOT ===========#

2
scripts/ui/settings_menu.sh
View File

@@ -13,7 +13,7 @@ set -e
### global variables ### global variables
INI_FILE="${HOME}/.kiauh.ini" INI_FILE="${HOME}/.kiauh.ini"
KLIPPER_CONFIG="${HOME}/klipper_config" KLIPPER_CONFIG="$(get_klipper_cfg_dir)"
function settings_ui() { function settings_ui() {
read_kiauh_ini read_kiauh_ini