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

refactor(utilities.sh): move code

Browse Source 
Signed-off-by: Dominik Willner th33xitus@gmail.com
This commit is contained in:
th33xitus
2022-04-02 11:09:30 +02:00
parent a8e9df2677
commit a8620eb781
1 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
scripts/utilities.sh
View File

@@ -346,38 +346,6 @@ install_gcode_shell_command(){
do_action_service "restart" "klipper" do_action_service "restart" "klipper"
} }
function install_kiauh_macros(){
### copy kiauh_macros.cfg
if [ "${ADD_KIAUH_MACROS}" = "true" ]; then
### create a backup of the config folder
backup_klipper_config_dir
### handle multi printer.cfg
if ls "${KLIPPER_CONFIG}"/printer_* 2>/dev/null 1>&2; then
for config in $(find ${KLIPPER_CONFIG}/printer_*/printer.cfg); do
path=$(echo "${config}" | rev | cut -d"/" -f2- | rev)
if [ ! -f "${path}/kiauh_macros.cfg" ]; then
### copy kiauh_macros.cfg to config location
status_msg "Creating macro config file ..."
cp "${SRCDIR}/kiauh/resources/kiauh_macros.cfg" "${path}"
### write the include to the very first line of the printer.cfg
sed -i "1 i [include kiauh_macros.cfg]" "${path}/printer.cfg"
ok_msg "${path}/kiauh_macros.cfg created!"
fi
done
### handle single printer.cfg
elif [ -f "${KLIPPER_CONFIG}/printer.cfg" ] && [ ! -f "${KLIPPER_CONFIG}/kiauh_macros.cfg" ]; then
### copy kiauh_macros.cfg to config location
status_msg "Creating macro config file ..."
cp "${SRCDIR}/kiauh/resources/kiauh_macros.cfg" "${KLIPPER_CONFIG}"
### write the include to the very first line of the printer.cfg
sed -i "1 i [include kiauh_macros.cfg]" "${KLIPPER_CONFIG}/printer.cfg"
ok_msg "${KLIPPER_CONFIG}/kiauh_macros.cfg created!"
fi
### restart klipper service to parse the modified printer.cfg
do_action_service "restart" "klipper"
fi
}
function system_check_webui(){ function system_check_webui(){
### check system for an installed and enabled octoprint service ### check system for an installed and enabled octoprint service
if sudo systemctl list-unit-files | grep -E "octoprint.*" | grep "enabled" &>/dev/null; then if sudo systemctl list-unit-files | grep -E "octoprint.*" | grep "enabled" &>/dev/null; then
@@ -437,6 +405,38 @@ function get_user_selection_kiauh_macros(){
done done
} }
function install_kiauh_macros(){
### copy kiauh_macros.cfg
if [ "${ADD_KIAUH_MACROS}" = "true" ]; then
### create a backup of the config folder
backup_klipper_config_dir
### handle multi printer.cfg
if ls "${KLIPPER_CONFIG}"/printer_* 2>/dev/null 1>&2; then
for config in $(find ${KLIPPER_CONFIG}/printer_*/printer.cfg); do
path=$(echo "${config}" | rev | cut -d"/" -f2- | rev)
if [ ! -f "${path}/kiauh_macros.cfg" ]; then
### copy kiauh_macros.cfg to config location
status_msg "Creating macro config file ..."
cp "${SRCDIR}/kiauh/resources/kiauh_macros.cfg" "${path}"
### write the include to the very first line of the printer.cfg
sed -i "1 i [include kiauh_macros.cfg]" "${path}/printer.cfg"
ok_msg "${path}/kiauh_macros.cfg created!"
fi
done
### handle single printer.cfg
elif [ -f "${KLIPPER_CONFIG}/printer.cfg" ] && [ ! -f "${KLIPPER_CONFIG}/kiauh_macros.cfg" ]; then
### copy kiauh_macros.cfg to config location
status_msg "Creating macro config file ..."
cp "${SRCDIR}/kiauh/resources/kiauh_macros.cfg" "${KLIPPER_CONFIG}"
### write the include to the very first line of the printer.cfg
sed -i "1 i [include kiauh_macros.cfg]" "${KLIPPER_CONFIG}/printer.cfg"
ok_msg "${KLIPPER_CONFIG}/kiauh_macros.cfg created!"
fi
### restart klipper service to parse the modified printer.cfg
do_action_service "restart" "klipper"
fi
}
function process_octoprint_dialog(){ function process_octoprint_dialog(){
#ask user to disable octoprint when its service was found #ask user to disable octoprint when its service was found
if [ "${OCTOPRINT_ENABLED}" = "true" ]; then if [ "${OCTOPRINT_ENABLED}" = "true" ]; then