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: typo and bug, also bring code in place for later moonraker version

Browse Source
This commit is contained in:
th33xitus
2020-08-30 13:59:19 +02:00
parent fc777ccb96
commit bae0c1f0fd
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/install_moonraker.sh
View File

@@ -162,15 +162,16 @@ get_user_selections_moonraker(){
done done
#ask user for mainsail default macros #ask user for mainsail default macros
while true; do while true; do
unset ADD_MS_MACROS
echo echo
read -p "${cyan}###### Add the recommended Mainsail macros? (Y/n):${default} " read -p "${cyan}###### Add the recommended Mainsail macros? (Y/n):${default} " yn
case "$yn" in case "$yn" in
Y|y|Yes|yes|"") Y|y|Yes|yes|"")
echo -e "###### > Yes" echo -e "###### > Yes"
ADD_MS_MCAROS="true";; ADD_MS_MACROS="true";;
N|n|No|no) N|n|No|no)
echo -e "###### > No" echo -e "###### > No"
ADD_MS_MCAROS="false";; ADD_MS_MACROS="false";;
esac esac
break break
done done
@@ -212,6 +213,12 @@ moonraker_setup(){
ok_msg "Download complete!" ok_msg "Download complete!"
status_msg "Installing Moonraker ..." status_msg "Installing Moonraker ..."
$MOONRAKER_DIR/scripts/install-moonraker.sh $MOONRAKER_DIR/scripts/install-moonraker.sh
#if [[ ! $(grep "klippy_uds" $KLIPPER_SERVICE2) ]]; then
# status_msg "Patching /etc/default/klipper ..."
# sudo sed -i "/KLIPPY_ARGS/s/\.log/\.log -a \/tmp\/klippy_uds/" $KLIPPER_SERVICE2
# ok_msg "Patching done!"
#fi
echo
ok_msg "Moonraker successfully installed!" ok_msg "Moonraker successfully installed!"
} }
@@ -255,7 +262,7 @@ setup_printer_config_mainsail(){
ok_msg "Done!" ok_msg "Done!"
fi fi
#copy mainsail_macro.cfg #copy mainsail_macro.cfg
if [ "$ADD_MS_MCAROS" = "true" ]; then if [ "$ADD_MS_MACROS" = "true" ]; then
status_msg "Create mainsail_macros.cfg ..." status_msg "Create mainsail_macros.cfg ..."
if [ ! -f ${HOME}/klipper_config/mainsail_macros.cfg ]; then if [ ! -f ${HOME}/klipper_config/mainsail_macros.cfg ]; then
cp ${HOME}/kiauh/resources/mainsail_macros.cfg ${HOME}/klipper_config cp ${HOME}/kiauh/resources/mainsail_macros.cfg ${HOME}/klipper_config
@@ -292,7 +299,7 @@ read_printer_cfg_mainsail(){
write_printer_cfg_mainsail(){ write_printer_cfg_mainsail(){
unset write_entries unset write_entries
if [ "$MS_MACRO" = "false" ] && [ "$ADD_MS_MCAROS" = "true" ]; then if [ "$MS_MACRO" = "false" ] && [ "$ADD_MS_MACROS" = "true" ]; then
write_entries+=("[include klipper_config/mainsail_macros.cfg]") write_entries+=("[include klipper_config/mainsail_macros.cfg]")
fi fi
if [ "$PAUSE_RESUME" = "false" ]; then if [ "$PAUSE_RESUME" = "false" ]; then