From 3a9dfba86cb7dadb1268fcfd689b14066779e6aa Mon Sep 17 00:00:00 2001
From: Udo <udo@openfu.com>
Date: Sun, 30 Jan 2022 12:45:18 +0000
Subject: [PATCH] fixed bug in #load

---
 doc/pages/.fuse_hidden000003f600000012                 |  0
 .../blog/config/settings.uce                           |  0
 examples/blog/index.uce                                |  3 ++-
 src/lib/compiler.cpp                                   |  3 ++-
 test/index.uce                                         |  2 +-
 test/shell.uce                                         | 10 +++++++++-
 6 files changed, 14 insertions(+), 4 deletions(-)
 delete mode 100644 doc/pages/.fuse_hidden000003f600000012
 rename doc/pages/.fuse_hidden000003f000000011 => examples/blog/config/settings.uce (100%)

diff --git a/doc/pages/.fuse_hidden000003f600000012 b/doc/pages/.fuse_hidden000003f600000012
deleted file mode 100644
index e69de29..0000000
diff --git a/doc/pages/.fuse_hidden000003f000000011 b/examples/blog/config/settings.uce
similarity index 100%
rename from doc/pages/.fuse_hidden000003f000000011
rename to examples/blog/config/settings.uce
diff --git a/examples/blog/index.uce b/examples/blog/index.uce
index 12ea541..0d3da24 100644
--- a/examples/blog/index.uce
+++ b/examples/blog/index.uce
@@ -1,9 +1,10 @@
+#load "config/settings.uce"
 #load "lib.uce"
 
 RENDER()
 {
 	<>
-	Hello world2
+	Hello world23
 	<?= bla("!x") ?>
 	</>
 }
diff --git a/src/lib/compiler.cpp b/src/lib/compiler.cpp
index 1ce7295..1360ee3 100644
--- a/src/lib/compiler.cpp
+++ b/src/lib/compiler.cpp
@@ -152,10 +152,11 @@ String preprocess_shared_unit_char_wise(Request* context, SharedUnit* su, String
 				pc.resize(pc.length() - current_line.length());
 				nibble(current_line, "\"");
 				String unit_name = nibble(current_line, "\"");
+				//printf("(i) #load %s\n", unit_name.c_str());
 				SharedUnit* sub_su = compiler_load_shared_unit(context, unit_name, su->src_path, true);
 				if(sub_su)
 				{
-					pc.append("#include \"" + sub_su->pre_file_name + "\"");
+					pc.append("#include \"" + sub_su->bin_path + "/" + sub_su->pre_file_name + "\"\n");
 				}
 			}
 			else if(current_line.length() == 4 && current_line.substr(0, 4) == "API ")
diff --git a/test/index.uce b/test/index.uce
index dad8973..3d7272d 100644
--- a/test/index.uce
+++ b/test/index.uce
@@ -26,7 +26,7 @@ RENDER()
 			<li><a href="memcached.uce">Memcached</a></li>
 			<li><a href="mysql.uce">MySQL Connector</a></li>
 			<li><a href="fileio.uce">File I/O</a></li>
-			<li><a href="shell.uce">Shell Stuff</a></li>
+			<li><a href="shell.uce">Shell</a></li>
 			<li><a href="file_append.uce">File Append</a></li>
 			<li><a href="random.uce">RNG/Noise</a></li>
 			<li><a href="task.uce">Task API</a></li>
diff --git a/test/shell.uce b/test/shell.uce
index 024b34a..16e8f0b 100644
--- a/test/shell.uce
+++ b/test/shell.uce
@@ -20,12 +20,20 @@ RENDER()
 
 		<div>shell_escape()</div>
 
-		<pre><?
+		<pre style="height:80px"><?
 
 			print(shell_exec("echo "+shell_escape("kasjdf 1ölkasj öflkjasdö\\lkfjsöa'ldkfj 23487692\"bla83746")));
 
 		?></pre>
 
+		<div>Git</div>
+
+		<pre><?
+
+			print(shell_exec("git show"));
+
+		?></pre>
+
 		<pre><?= var_dump(context->params) ?></pre>
 	</html></>