jeka/kiauh
1
0
Fork 0
mirror of https://github.com/dw-0/kiauh.git synced 2025-12-14 11:04:29 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix: update the config folder change function (its more like a "rename only" function now and should be plenty sufficient?)

Browse Source
This commit is contained in:
th33xitus
2021-01-10 12:55:24 +01:00
parent 9ea29bf995
commit b12d344b40
2 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
scripts/functions.sh
View File

@@ -43,13 +43,13 @@ change_klipper_cfg_path(){
Y|y|Yes|yes|"") Y|y|Yes|yes|"")
echo -e "###### > Yes" echo -e "###### > Yes"
### backup the old config dir
backup_klipper_config_dir
### write new location to kiauh.ini ### write new location to kiauh.ini
sed -i "s|klipper_cfg_loc=$old_klipper_cfg_loc|klipper_cfg_loc=$new_klipper_cfg_loc|" $INI_FILE sed -i "s|klipper_cfg_loc=$old_klipper_cfg_loc|klipper_cfg_loc=$new_klipper_cfg_loc|" $INI_FILE
status_msg "Directory set to '$new_klipper_cfg_loc'!" status_msg "Directory set to '$new_klipper_cfg_loc'!"
### backup the old config dir
backup_klipper_config_dir
### write new location to klipper and moonraker service ### write new location to klipper and moonraker service
set_klipper_cfg_path set_klipper_cfg_path
@@ -67,17 +67,18 @@ change_klipper_cfg_path(){
} }
###? if path was changed in 'change_klipper_cfg_path', we need to edit the service files ###? if path was changed in 'change_klipper_cfg_path', we need to edit the service files
###? and set the new path. after that, copy configs to new location and reload service units. ###? and set the new path. after that, rename the old folder and reload service units.
###! users shouldn't try and move the files into subfolders with this function! as the mv command will fail
###! but the new path still gets written to the service files. if they really need to, they need to move all
###! config files or printer folder into that subfolder (still not recommended!)
set_klipper_cfg_path(){ set_klipper_cfg_path(){
### stop services ### stop services
klipper_service "stop" && moonraker_service "stop" klipper_service "stop" && moonraker_service "stop"
### copy config files to new location if old location exists ### rename the klipper config folder
[ ! -d "$new_klipper_cfg_loc" ] && mkdir -p "$new_klipper_cfg_loc" if [ ! -z "$old_klipper_cfg_loc" ] && [ -d "$old_klipper_cfg_loc" ]; then
if [ ! -z "$old_klipper_cfg_loc" ]; then status_msg "Renaming '$old_klipper_cfg_loc' to '$new_klipper_cfg_loc'!"; echo
status_msg "Copy files to '$new_klipper_cfg_loc'!"; echo mv -v "$old_klipper_cfg_loc" "$new_klipper_cfg_loc" && ok_msg "Done!"
cd $old_klipper_cfg_loc
cp -avr * "$new_klipper_cfg_loc/" && ok_msg "Done!"
fi fi
### handle single klipper instance service file ### handle single klipper instance service file
@@ -90,7 +91,7 @@ set_klipper_cfg_path(){
if ls /etc/systemd/system/klipper-*.service 2>/dev/null 1>&2; then if ls /etc/systemd/system/klipper-*.service 2>/dev/null 1>&2; then
status_msg "Configuring Klipper for new path ..." status_msg "Configuring Klipper for new path ..."
for service in $(find /etc/systemd/system/klipper-*.service); do for service in $(find /etc/systemd/system/klipper-*.service); do
sudo sed -i "/ExecStart=/ s|$old_klipper_cfg_loc/printer-|$new_klipper_cfg_loc/printer-|" $service sudo sed -i "/ExecStart=/ s|$old_klipper_cfg_loc/printer_|$new_klipper_cfg_loc/printer_|" $service
done done
ok_msg "OK!" ok_msg "OK!"
fi fi
@@ -107,11 +108,12 @@ set_klipper_cfg_path(){
if ls /etc/systemd/system/moonraker-*.service 2>/dev/null 1>&2; then if ls /etc/systemd/system/moonraker-*.service 2>/dev/null 1>&2; then
status_msg "Configuring Moonraker for new path ..." status_msg "Configuring Moonraker for new path ..."
for service in $(find /etc/systemd/system/moonraker-*.service); do for service in $(find /etc/systemd/system/moonraker-*.service); do
sudo sed -i "/ExecStart=/ s|$old_klipper_cfg_loc/moonraker-|$new_klipper_cfg_loc/moonraker-|" $service sudo sed -i "/ExecStart=/ s|$old_klipper_cfg_loc/printer_|$new_klipper_cfg_loc/printer_|" $service
done done
### replace old file path with new one in moonraker-*.conf ### replace old file path with new one in moonraker.conf
for moonraker_conf in $(find $new_klipper_cfg_loc/moonraker-*.conf); do for moonraker_conf in $(find $new_klipper_cfg_loc/printer_*/moonraker.conf); do
sed -i "/config_path:/ s|config_path:.*|config_path: $new_klipper_cfg_loc|" $moonraker_conf loc=$(echo "$moonraker_conf" | rev | cut -d"/" -f2- | rev)
sed -i "/config_path:/ s|config_path:.*|config_path: $loc|" $moonraker_conf
done done
ok_msg "OK!" ok_msg "OK!"
fi fi

12
scripts/ui/settings_menu.sh
View File

@@ -5,18 +5,18 @@ settings_ui(){
echo -e "| $(title_msg "~~~~~~~~~~~~ [ KIAUH Settings ] ~~~~~~~~~~~~~") | " echo -e "| $(title_msg "~~~~~~~~~~~~ [ KIAUH Settings ] ~~~~~~~~~~~~~") | "
hr hr
echo -e "| ${red}Caution:${default} | " echo -e "| ${red}Caution:${default} | "
echo -e "| Changing the path below will COPY the config files | " echo -e "| When you rename the config folder, be aware that ALL | "
echo -e "| to the new location. During that process ALL Klipper | " echo -e "| Klipper and Moonraker services will be STOPPED, | "
echo -e "| and Moonraker services get stopped and reconfigured. | " echo -e "| reconfigured and then restarted again. | "
blank_line blank_line
echo -e "| ${red}DO NOT change the folder location during printing!${default} | " echo -e "| ${red}DO NOT rename the folder during printing!${default} | "
hr hr
blank_line blank_line
echo -e "| ${yellow}● Current Klipper configuration folder:${default} | " echo -e "| ${yellow}● Current Klipper config folder:${default} | "
printf "|%-55s|\n" " $klipper_cfg_loc" printf "|%-55s|\n" " $klipper_cfg_loc"
blank_line blank_line
hr hr
echo -e "| 1) Change configuration folder | " echo -e "| 1) Rename config folder | "
quit_footer quit_footer
} }