jeka/kiauh
1
0
Fork 0
mirror of https://github.com/dw-0/kiauh.git synced 2025-12-17 20:44:28 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix: followup to 9fc7f41

Browse Source
This commit is contained in:
th33xitus
2020-10-28 23:16:24 +01:00
parent b48319e24d
commit 55382b1ecb
1 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
scripts/install_moonraker.sh
View File

@@ -46,9 +46,13 @@ system_check_moonraker(){
OCTOPRINT_ENABLED="true" OCTOPRINT_ENABLED="true"
fi fi
#check if haproxy is installed #check if haproxy is installed
[[ $(dpkg-query -f'${Status}' --show haproxy 2>/dev/null) = *\ installed ]] && HAPROXY_FOUND="true" if [[ $(dpkg-query -f'${Status}' --show haproxy 2>/dev/null) = *\ installed ]]; then
HAPROXY_FOUND="true"
fi
#check if lighttpd is installed #check if lighttpd is installed
[[ $(dpkg-query -f'${Status}' --show lighttpd 2>/dev/null) = *\ installed ]] && LIGHTTPD_FOUND="true" if [[ $(dpkg-query -f'${Status}' --show lighttpd 2>/dev/null) = *\ installed ]]; then
LIGHTTPD_FOUND="true"
fi
} }
get_user_selections_moonraker(){ get_user_selections_moonraker(){
@@ -254,8 +258,7 @@ moonraker_setup(){
patch_klipper_sysfile patch_klipper_sysfile
#re-run printer.cfg location function to read the new path for the printer.cfg #re-run printer.cfg location function to read the new path for the printer.cfg
locate_printer_cfg locate_printer_cfg
echo echo; ok_msg "Moonraker successfully installed!"
ok_msg "Moonraker successfully installed!"
} }
patch_klipper_sysfile(){ patch_klipper_sysfile(){
@@ -355,30 +358,35 @@ sc_check(){
} }
read_printer_cfg(){ read_printer_cfg(){
echo "selected: $1"
echo "pre sc"
sc_check sc_check
echo "past sc"
if [ "$1" = "moonraker" ]; then if [ "$1" = "moonraker" ]; then
echo "$1" && echo "moonraker"
[ ! "$(grep '^\[virtual_sdcard\]$' $PRINTER_CFG)" ] && VSD="false" [ ! "$(grep '^\[virtual_sdcard\]$' $PRINTER_CFG)" ] && VSD="false"
[ ! "$(grep '^\[pause_resume\]$' $PRINTER_CFG)" ] && PAUSE_RESUME="false" [ ! "$(grep '^\[pause_resume\]$' $PRINTER_CFG)" ] && PAUSE_RESUME="false"
[ ! "$(grep '^\[display_status\]$' $PRINTER_CFG)" ] && DISPLAY_STATUS="false" [ ! "$(grep '^\[display_status\]$' $PRINTER_CFG)" ] && DISPLAY_STATUS="false"
elif [ "$1" = "mainsail" ] || [ "$1" = "fluidd" ]; then elif [ "$1" = "mainsail" ] || [ "$1" = "fluidd" ]; then
echo "$1" && echo "mainsail/fluidd"
[ ! "$(grep '^\[include webui_macros\.cfg\]$' $PRINTER_CFG)" ] && WEBUI_MACROS="false" [ ! "$(grep '^\[include webui_macros\.cfg\]$' $PRINTER_CFG)" ] && WEBUI_MACROS="false"
fi fi
} }
write_printer_cfg(){ write_printer_cfg(){
unset write_entries #create kiauh.cfg if its needed and doesn't exist
[ "$VSD" = "false" ] && write_entries+=("[virtual_sdcard]\npath: ~/sdcard") if [ "$VSD" = "false" ] || [ "$PAUSE_RESUME" = "false" ] || [ "$DISPLAY_STATUS" = "false" ] || [ "$WEBUI_MACROS" = "false" ] && [ ! -f ~/klipper_config/kiauh.cfg ]; then
[ "$PAUSE_RESUME" = "false" ] && write_entries+=("[pause_resume]") status_msg "Creating kiauh.cfg ..."
[ "$DISPLAY_STATUS" = "false" ] && write_entries+=("[display_status]") echo -e "##### AUTOCREATED BY KIAUH #####" > ~/klipper_config/kiauh.cfg
[ "$WEBUI_MACROS" = "false" ] && [ "$ADD_WEBUI_MACROS" = "true" ] && write_entries+=("[include webui_macros.cfg]") fi
[ "${#write_entries[@]}" != "0" ] && write_entries=("##### AUTOCREATED BY KIAUH #####" "${write_entries[@]}") #write each entry to kiauh.cfg if it doesn't exist
#write needed entries to kiauh.cfg if [ "$VSD" = "false" ] && [[ ! $(grep '^\[virtual_sdcard\]$' ~/klipper_config/kiauh.cfg) ]]; then
for entry in "${write_entries[@]}"; do echo -e "$entry" >> ~/klipper_config/kiauh.cfg; done echo -e "\n[virtual_sdcard]\npath: ~/sdcard\c" >> ~/klipper_config/kiauh.cfg
fi
if [ "$PAUSE_RESUME" = "false" ] && [[ ! $(grep '^\[pause_resume]$' ~/klipper_config/kiauh.cfg) ]]; then
echo -e "\n[pause_resume]\c" >> ~/klipper_config/kiauh.cfg
fi
if [ "$DISPLAY_STATUS" = "false" ] && [[ ! $(grep '^\[display_status]$' ~/klipper_config/kiauh.cfg) ]]; then
echo -e "\n[display_status]\c" >> ~/klipper_config/kiauh.cfg
fi
if [ "$WEBUI_MACROS" = "false" ] && [ "$ADD_WEBUI_MACROS" = "true" ] && [[ ! $(grep '^\[include webui_macros.cfg]$' ~/klipper_config/kiauh.cfg) ]]; then
echo -e "\n[include webui_macros.cfg]\c" >> ~/klipper_config/kiauh.cfg
fi
#execute writing to printer.cfg #execute writing to printer.cfg
if [ ! "$(grep '^\[include kiauh\.cfg\]$' $PRINTER_CFG)" ]; then if [ ! "$(grep '^\[include kiauh\.cfg\]$' $PRINTER_CFG)" ]; then
status_msg "Writing [include kiauh.cfg] to printer.cfg ..." status_msg "Writing [include kiauh.cfg] to printer.cfg ..."