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

refactor(klipper): use global const for printer_data path

Browse Source 
Signed-off-by: Dominik Willner <th33xitus@gmail.com>
This commit is contained in:
th33xitus
2022-10-16 10:43:14 +02:00
parent e1cd8a9018
commit da771783f5
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/globals.sh
View File

@@ -17,6 +17,7 @@ function set_globals() {
SYSTEMD="/etc/systemd/system" SYSTEMD="/etc/systemd/system"
INITD="/etc/init.d" INITD="/etc/init.d"
ETCDEF="/etc/default" ETCDEF="/etc/default"
PRINTER_DATA="${HOME}/printer_data"
#=================== KIAUH ====================# #=================== KIAUH ====================#
green=$(echo -en "\e[92m") green=$(echo -en "\e[92m")

16
scripts/klipper.sh
View File

@@ -291,11 +291,10 @@ function configure_klipper_service() {
local input=("${@}") local input=("${@}")
local klipper_count=${input[0]} && unset "input[0]" local klipper_count=${input[0]} && unset "input[0]"
local names=("${input[@]}") && unset "input[@]" local names=("${input[@]}") && unset "input[@]"
local printer_data cfg_dir cfg log printer uds service env_file local cfg_dir cfg log printer uds service env_file
if (( klipper_count == 1 )) && [[ ${#names[@]} -eq 0 ]]; then if (( klipper_count == 1 )) && [[ ${#names[@]} -eq 0 ]]; then
printer_data="${HOME}/printer_data" cfg_dir="${PRINTER_DATA}/config"
cfg_dir="${printer_data}/config"
cfg="${cfg_dir}/printer.cfg" cfg="${cfg_dir}/printer.cfg"
log="${HOME}/printer_data/logs/klippy.log" log="${HOME}/printer_data/logs/klippy.log"
printer="/tmp/printer" printer="/tmp/printer"
@@ -314,18 +313,19 @@ function configure_klipper_service() {
for (( i=1; i <= klipper_count; i++ )); do for (( i=1; i <= klipper_count; i++ )); do
### overwrite config folder if name is only a number ### overwrite config folder if name is only a number
if [[ ${names[j]} =~ ${re} ]]; then if [[ ${names[j]} =~ ${re} ]]; then
printer_data="${printer_data}/printer_${names[${j}]}" cfg_dir="${PRINTER_DATA}/printer_${names[${j}]}/config"
log="${PRINTER_DATA}/printer_${names[${j}]}/logs/klippy.log"
env_file="${PRINTER_DATA}/printer_${names[${j}]}/systemd/klipper.env"
else else
printer_data="${printer_data}/${names[${j}]}" cfg_dir="${PRINTER_DATA}/${names[${j}]}/config"
log="${PRINTER_DATA}/${names[${j}]}/logs/klippy.log"
env_file="${PRINTER_DATA}/${names[${j}]}/systemd/klipper.env"
fi fi
cfg_dir="${printer_data}/config"
cfg="${cfg_dir}/printer.cfg" cfg="${cfg_dir}/printer.cfg"
log="${printer_data}/logs/klippy.log"
printer="/tmp/printer-${names[${j}]}" printer="/tmp/printer-${names[${j}]}"
uds="/tmp/klippy_uds-${names[${j}]}" uds="/tmp/klippy_uds-${names[${j}]}"
service="${SYSTEMD}/klipper-${names[${j}]}.service" service="${SYSTEMD}/klipper-${names[${j}]}.service"
env_file="${printer_data}/systemd/klipper.env"
### write multi instance service ### write multi instance service
write_klipper_service "${names[${j}]}" "${cfg}" "${log}" "${printer}" "${uds}" "${service}" "${env_file}" write_klipper_service "${names[${j}]}" "${cfg}" "${log}" "${printer}" "${uds}" "${service}" "${env_file}"