fix(core): add linebreaks when placing wrappers which were not removed.

This commit is contained in:
purple 2023-12-18 21:26:21 +01:00
parent 5c6681cd31
commit 2e3ceea125

View file

@ -728,8 +728,8 @@ if [[ ( $2 == "-i" ) || ( $2 == "-install" ) ]]; then VCMD="y"
log_bright "[INFO] Placing dashboard wrapper.." log_bright "[INFO] Placing dashboard wrapper.."
if [[ $DUPLICATE == "y" ]]; then if [[ $DUPLICATE == "y" ]]; then
sed -n -i "/<!--␀$identifier:start␀-->/{p; :a; N; /<!--␀$identifier:stop␀-->/!ba; s/.*\n//}; p" "resources/views/templates/wrapper.blade.php" sed -n -i "/<!--␀$identifier:start␀-->/{p; :a; N; /<!--␀$identifier:stop␀-->/!ba; s/.*\n//}; p" "resources/views/templates/wrapper.blade.php"
sed -i "s~<!--␀$identifier:start␀-->~~g" "resources/views/templates/wrapper.blade.php" sed -i "s~<!--␀$identifier:start␀-->\n~~g" "resources/views/templates/wrapper.blade.php"
sed -i "s~<!--␀$identifier:stop␀-->~~g" "resources/views/templates/wrapper.blade.php" sed -i "s~\n<!--␀$identifier:stop␀-->~~g" "resources/views/templates/wrapper.blade.php"
fi fi
touch ".blueprint/tmp/$n/$dashboard_wrapper.BLUEPRINTBAK" touch ".blueprint/tmp/$n/$dashboard_wrapper.BLUEPRINTBAK"
cat <(echo "<!--␀$identifier:start␀-->") ".blueprint/tmp/$n/$dashboard_wrapper" > ".blueprint/tmp/$n/$dashboard_wrapper.BLUEPRINTBAK" cat <(echo "<!--␀$identifier:start␀-->") ".blueprint/tmp/$n/$dashboard_wrapper" > ".blueprint/tmp/$n/$dashboard_wrapper.BLUEPRINTBAK"
@ -744,8 +744,8 @@ if [[ ( $2 == "-i" ) || ( $2 == "-install" ) ]]; then VCMD="y"
log_bright "[INFO] Placing admin wrapper.." log_bright "[INFO] Placing admin wrapper.."
if [[ $DUPLICATE == "y" ]]; then if [[ $DUPLICATE == "y" ]]; then
sed -n -i "/<!--␀$identifier:start␀-->/{p; :a; N; /<!--␀$identifier:stop␀-->/!ba; s/.*\n//}; p" "resources/views/layouts/admin.blade.php" sed -n -i "/<!--␀$identifier:start␀-->/{p; :a; N; /<!--␀$identifier:stop␀-->/!ba; s/.*\n//}; p" "resources/views/layouts/admin.blade.php"
sed -i "s~<!--␀$identifier:start␀-->~~g" "resources/views/layouts/admin.blade.php" sed -i "s~\n<!--␀$identifier:start␀-->~~g" "resources/views/layouts/admin.blade.php"
sed -i "s~<!--␀$identifier:stop␀-->~~g" "resources/views/layouts/admin.blade.php" sed -i "s~<!--␀$identifier:stop␀-->\n~~g" "resources/views/layouts/admin.blade.php"
fi fi
touch ".blueprint/tmp/$n/$admin_wrapper.BLUEPRINTBAK" touch ".blueprint/tmp/$n/$admin_wrapper.BLUEPRINTBAK"
cat <(echo "<!--␀$identifier:start␀-->") ".blueprint/tmp/$n/$admin_wrapper" > ".blueprint/tmp/$n/$admin_wrapper.BLUEPRINTBAK" cat <(echo "<!--␀$identifier:start␀-->") ".blueprint/tmp/$n/$admin_wrapper" > ".blueprint/tmp/$n/$admin_wrapper.BLUEPRINTBAK"
@ -930,16 +930,16 @@ if [[ ( $2 == "-r" ) || ( $2 == "-remove" ) ]]; then VCMD="y"
if [[ $admin_wrapper != "" ]]; then if [[ $admin_wrapper != "" ]]; then
log_bright "[INFO] Removing admin wrapper.." log_bright "[INFO] Removing admin wrapper.."
sed -n -i "/<!--␀$identifier:start␀-->/{p; :a; N; /<!--␀$identifier:stop␀-->/!ba; s/.*\n//}; p" "resources/views/layouts/admin.blade.php" sed -n -i "/<!--␀$identifier:start␀-->/{p; :a; N; /<!--␀$identifier:stop␀-->/!ba; s/.*\n//}; p" "resources/views/layouts/admin.blade.php"
sed -i "s~<!--␀$identifier:start␀-->~~g" "resources/views/layouts/admin.blade.php" sed -i "s~<!--␀$identifier:start␀-->\n~~g" "resources/views/layouts/admin.blade.php"
sed -i "s~<!--␀$identifier:stop␀-->~~g" "resources/views/layouts/admin.blade.php" sed -i "s~\n<!--␀$identifier:stop␀-->~~g" "resources/views/layouts/admin.blade.php"
fi fi
# Remove dashboard wrapper # Remove dashboard wrapper
if [[ $dashboard_wrapper != "" ]]; then if [[ $dashboard_wrapper != "" ]]; then
log_bright "[INFO] Removing dashboard wrapper.." log_bright "[INFO] Removing dashboard wrapper.."
sed -n -i "/<!--␀$identifier:start␀-->/{p; :a; N; /<!--␀$identifier:stop␀-->/!ba; s/.*\n//}; p" "resources/views/templates/wrapper.blade.php" sed -n -i "/<!--␀$identifier:start␀-->/{p; :a; N; /<!--␀$identifier:stop␀-->/!ba; s/.*\n//}; p" "resources/views/templates/wrapper.blade.php"
sed -i "s~<!--␀$identifier:start␀-->~~g" "resources/views/templates/wrapper.blade.php" sed -i "s~<!--␀$identifier:start␀-->\n~~g" "resources/views/templates/wrapper.blade.php"
sed -i "s~<!--␀$identifier:stop␀-->~~g" "resources/views/templates/wrapper.blade.php" sed -i "s~\n<!--␀$identifier:stop␀-->~~g" "resources/views/templates/wrapper.blade.php"
fi fi
# Remove dashboard css # Remove dashboard css