From 09cd89ae932c6089621e76f05583c0793c92a8a1 Mon Sep 17 00:00:00 2001
From: BodgeMaster <>
Date: Thu, 2 Sep 2021 08:13:31 +0200
Subject: [PATCH] I give up on using wildcards

---
 deployment-script.sh                                     | 9 ++++-----
 .../{pass3_base-names.json => pass3_install-config.json} | 3 ++-
 macros/pass4_install-config.json                         | 3 ---
 3 files changed, 6 insertions(+), 9 deletions(-)
 rename macros/{pass3_base-names.json => pass3_install-config.json} (65%)
 delete mode 100644 macros/pass4_install-config.json

diff --git a/deployment-script.sh b/deployment-script.sh
index fe436c0..8e1e05b 100644
--- a/deployment-script.sh
+++ b/deployment-script.sh
@@ -9,11 +9,10 @@ if [ -n "`shopt globstar | grep off`" ]; then shopt -s globstar; fi
 rm ./threadr/**/README.md
 
 #run the macro handler
-echo -n "`find -name "*.php" -or -name "*.html" -or -name "*.css" -or -name "*.svg" | sed 's/^/python variable_grabbler.py /;s/$/ macros/pass0\\\*.json/'`" | bash -
-echo -n "`find -name "*.php" -or -name "*.html" -or -name "*.css" -or -name "*.svg" | sed 's/^/python variable_grabbler.py /;s/$/ macros/pass1\\\*.json/'`" | bash -
-echo -n "`find -name "*.php" -or -name "*.html" -or -name "*.css" -or -name "*.svg" | sed 's/^/python variable_grabbler.py /;s/$/ macros/pass2\\\*.json/'`" | bash -
-echo -n "`find -name "*.php" -or -name "*.html" -or -name "*.css" -or -name "*.svg" | sed 's/^/python variable_grabbler.py /;s/$/ macros/pass3\\\*.json/'`" | bash -
-echo -n "`find -name "*.php" -or -name "*.html" -or -name "*.css" -or -name "*.svg" | sed 's/^/python variable_grabbler.py /;s/$/ macros/pass4\\\*.json/'`" | bash -
+echo -n "`find -name "*.php" -or -name "*.html" -or -name "*.css" -or -name "*.svg" | sed 's/^/python variable_grabbler.py /;s/$/ macros/pass0_templates.json/'`" | bash -
+echo -n "`find -name "*.php" -or -name "*.html" -or -name "*.css" -or -name "*.svg" | sed 's/^/python variable_grabbler.py /;s/$/ macros/pass1_misc.json/'`" | bash -
+echo -n "`find -name "*.php" -or -name "*.html" -or -name "*.css" -or -name "*.svg" | sed 's/^/python variable_grabbler.py /;s/$/ macros/pass2_session.json/'`" | bash -
+echo -n "`find -name "*.php" -or -name "*.html" -or -name "*.css" -or -name "*.svg" | sed 's/^/python variable_grabbler.py /;s/$/ macros/pass3_install-config.json/'`" | bash -
 
 echo "==============================================================================
 Done."
diff --git a/macros/pass3_base-names.json b/macros/pass3_install-config.json
similarity index 65%
rename from macros/pass3_base-names.json
rename to macros/pass3_install-config.json
index 24eb037..d4acbeb 100644
--- a/macros/pass3_base-names.json
+++ b/macros/pass3_install-config.json
@@ -1,4 +1,5 @@
 {
   "DOMAIN_NAME":["exec","sed --quiet "/domain_name=/s/.*=//p" config/names.conf"],
-  "CONTENT_DIR":["exec","sed --quiet "/threadr_home=/s/.*=//p" config/names.conf"]
+  "CONTENT_DIR":["exec","sed --quiet "/threadr_home=/s/.*=//p" config/names.conf"],
+  "ABOUT_PAGE":["file","config/templates/about.template"]
 }
diff --git a/macros/pass4_install-config.json b/macros/pass4_install-config.json
deleted file mode 100644
index 6e96021..0000000
--- a/macros/pass4_install-config.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "ABOUT_PAGE":["file","config/templates/about.template"]
-}