From d3a12f7db795778c11f115a74f8e13f862b43d27 Mon Sep 17 00:00:00 2001 From: th33xitus Date: Wed, 18 Nov 2020 17:37:54 +0100 Subject: [PATCH] fix: add a patch due to recent changes to fluidd --- scripts/install_klipper_webui.sh | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/scripts/install_klipper_webui.sh b/scripts/install_klipper_webui.sh index e57e08e..b9b5275 100755 --- a/scripts/install_klipper_webui.sh +++ b/scripts/install_klipper_webui.sh @@ -239,8 +239,34 @@ fluidd_setup(){ #write fluidd version to file for update check reasons status_msg "Writing Fluidd version to file ..." get_fluidd_ver && echo $FLUIDD_VERSION > $FLUIDD_DIR/version && ok_msg "Done!" + #patch moonraker.conf to apply cors domains if needed + backup_moonraker_conf + patch_moonraker #delete downloaded zip status_msg "Remove downloaded archive ..." rm -rf *.zip && ok_msg "Done!" && ok_msg "Fluidd installation complete!" echo } + +patch_moonraker(){ + mr_conf=${HOME}/moonraker.conf + # looking for a cors_domain entry in moonraker.conf + if [ ! "$(grep "^cors_domains:$" $mr_conf)" ]; then + #find trusted_clients line number and subtract one, to insert cors_domains later + line="$(grep -n "trusted_clients:" $mr_conf | cut -d":" -f1)i" + sed -i "$line cors_domains:" $mr_conf + fi + if [ "$(grep "^cors_domains:$" $mr_conf)" ]; then + hostname=$(hostname -I | cut -d" " -f1) + url1="\ \ \ \ http://*.local" + url2="\ \ \ \ http://app.fluidd.xyz" + url3="\ \ \ \ https://app.fluidd.xyz" + url4="\ \ \ \ http://$hostname:*" + #find cors_domains line number and add one, to insert urls later + line="$(expr $(grep -n "cors_domains:" $mr_conf | cut -d":" -f1) + 1)i" + [ ! "$(grep -E '^\s+http:\/\/\*\.local$' $mr_conf)" ] && sed -i "$line $url1" $mr_conf + [ ! "$(grep -E '^\s+http:\/\/app\.fluidd\.xyz$' $mr_conf)" ] && sed -i "$line $url2" $mr_conf + [ ! "$(grep -E '^\s+https:\/\/app\.fluidd\.xyz$' $mr_conf)" ] && sed -i "$line $url3" $mr_conf + [ ! "$(grep -E '^\s+http:\/\/([0-9]{1,3}\.){3}[0-9]{1,3}' $mr_conf)" ] && sed -i "$line $url4" $mr_conf + fi +} \ No newline at end of file