From 1e6a91581429d84c8f609a4ef7a29dd549e6ba6e Mon Sep 17 00:00:00 2001
From: purple <hello@prpl.wtf>
Date: Tue, 30 May 2023 21:31:07 +0200
Subject: [PATCH] Fix problems with multiple line admin views.

---
 blueprint.sh                                  | 19 ++++++++-----------
 .../defaults/extensions/admin.default         |  4 +---
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/blueprint.sh b/blueprint.sh
index c4d4896..21f2030 100644
--- a/blueprint.sh
+++ b/blueprint.sh
@@ -168,10 +168,6 @@ if [[ ( $2 == "-i" ) || ( $2 == "-install" ) ]]; then
     if [[ $flags != *"-placeholders.skip;"* ]]; then
         DIR=.blueprint/.storage/tmp/$n/*;
 
-        # ^#version#^ = version
-        # ^#author#^ = author
-        # ^#identifier#^ = identifier
-
         if [[ $flags == *"-disable_az_placeholders;"* ]]; then
             SKIPAZPLACEHOLDERS=true;
             echo "A-Z placeholders will be skipped due to the '-disable_az_placeholders;' flag.";
@@ -179,12 +175,12 @@ if [[ ( $2 == "-i" ) || ( $2 == "-install" ) ]]; then
             SKIPAZPLACEHOLDERS=false;
         fi;
 
-        for f in $(find $DIR -type f -print); do
-            sed -i "s~^#version#^~$version~g" $f;
-            sed -i "s~^#author#^~$author~g" $f;
-            sed -i "s~^#identifier#^~$identifier~g" $f;
-            sed -i "s~^#path#^~/var/www/$FOLDER~g" $f;
-            sed -i "s~^#datapath#^~/var/www/$FOLDER/.blueprint/.storage/extensiondata/$identifier~g" $f;
+        for f in $(find $DIR -type f -exec echo {} \;); do
+            sed -i "s~\^#version#\^~$version~g" $f;
+            sed -i "s~\^#author#\^~$author~g" $f;
+            sed -i "s~\^#identifier#\^~$identifier~g" $f;
+            sed -i "s~\^#path#\^~/var/www/$FOLDER~g" $f;
+            sed -i "s~\^#datapath#\^~/var/www/$FOLDER/.blueprint/.storage/extensiondata/$identifier~g" $f;
 
             if [[ $SKIPAZPLACEHOLDERS != true ]]; then
                 sed -i "s~bpversionreplace~$version~g" $f;
@@ -196,6 +192,7 @@ if [[ ( $2 == "-i" ) || ( $2 == "-install" ) ]]; then
 
             echo "Done placeholders in '$f'.";
         done;
+
     else echo "-placeholders.skip;"; fi;
 
     if [[ $name == "" ]]; then rm -R .blueprint/.storage/tmp/$n; error "'name' is a required option.";fi;
@@ -313,7 +310,7 @@ if [[ ( $2 == "-i" ) || ( $2 == "-install" ) ]]; then
 
     sed -i "s~␀icon␀~$ICON~g" .blueprint/.storage/defaults/extensions/admin.default.bak;
 
-    sed -i "s~␀content␀~$CONTENT~g" .blueprint/.storage/defaults/extensions/admin.default.bak;
+    echo -e "$CONTENT\n@endsection" >> .blueprint/.storage/defaults/extensions/admin.default.bak;
 
     if [[ $controller_type != "custom" ]]; then
         sed -i "s~␀id␀~$identifier~g" .blueprint/.storage/defaults/extensions/controller.default.bak;
diff --git a/blueprint/.storage/defaults/extensions/admin.default b/blueprint/.storage/defaults/extensions/admin.default
index c35d02d..2bcb084 100644
--- a/blueprint/.storage/defaults/extensions/admin.default
+++ b/blueprint/.storage/defaults/extensions/admin.default
@@ -15,6 +15,4 @@
 @endsection
 
 @section('content')
-    <p>␀description␀</p>
-    ␀content␀
-@endsection
\ No newline at end of file
+    <p>␀description␀</p>
\ No newline at end of file