From 05d60b4afc58d4cc5e78d41b2ffdc94d32972f63 Mon Sep 17 00:00:00 2001 From: BodgeMaster <> Date: Wed, 8 Sep 2021 09:20:38 +0200 Subject: [PATCH] fixed #51 to make the new variable grabbler work properly --- build/README.md | 1 + deployment-script.sh | 20 +++++++++++------- {threadr => src}/README.md | 0 {threadr => src}/about/README.md | 0 {threadr => src}/about/index.php | 0 {threadr => src}/accept_cookie.php | 0 {threadr => src}/board/README.md | 0 {threadr => src}/board/board.php | 0 {threadr => src}/board/default.php | 0 {threadr => src}/board/edit.php | 0 {threadr => src}/board/index.php | 0 {threadr => src}/board/post.php | 0 {threadr => src}/board/submit.php | 0 {threadr => src}/boards/README.md | 0 {threadr => src}/boards/index.php | 0 {threadr => src}/img/README.md | 0 {threadr => src}/img/ThreadR.png | Bin {threadr => src}/img/ThreadR.svg | 0 {threadr => src}/img/ThreadR_Home.svg | 0 {threadr => src}/img/favicon-32x32.png | Bin {threadr => src}/img/index.html | 0 {threadr => src}/img/threadR.png | Bin {threadr => src}/index.php | 0 {threadr => src}/login/README.md | 0 {threadr => src}/login/index.php | 0 {threadr => src}/login/redirect.php | 0 {threadr => src}/logout/README.md | 0 {threadr => src}/logout/index.php | 0 {threadr => src}/news/README.md | 0 {threadr => src}/news/index.php | 0 {threadr => src}/profile/README.md | 0 {threadr => src}/profile/default.php | 0 {threadr => src}/profile/edit.php | 0 {threadr => src}/profile/index.php | 0 {threadr => src}/signup/README.md | 0 {threadr => src}/signup/index.php | 0 .../signup/verify-email/README.md | 0 .../signup/verify-email/index.php | 0 .../signup/verify-email/redirect.php | 0 {threadr => src}/style.css | 0 {threadr => src}/userhome/README.md | 0 {threadr => src}/userhome/index.php | 0 utf8test | 4 ---- 43 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 build/README.md rename {threadr => src}/README.md (100%) rename {threadr => src}/about/README.md (100%) rename {threadr => src}/about/index.php (100%) rename {threadr => src}/accept_cookie.php (100%) rename {threadr => src}/board/README.md (100%) rename {threadr => src}/board/board.php (100%) rename {threadr => src}/board/default.php (100%) rename {threadr => src}/board/edit.php (100%) rename {threadr => src}/board/index.php (100%) rename {threadr => src}/board/post.php (100%) rename {threadr => src}/board/submit.php (100%) rename {threadr => src}/boards/README.md (100%) rename {threadr => src}/boards/index.php (100%) rename {threadr => src}/img/README.md (100%) rename {threadr => src}/img/ThreadR.png (100%) rename {threadr => src}/img/ThreadR.svg (100%) rename {threadr => src}/img/ThreadR_Home.svg (100%) rename {threadr => src}/img/favicon-32x32.png (100%) rename {threadr => src}/img/index.html (100%) rename {threadr => src}/img/threadR.png (100%) rename {threadr => src}/index.php (100%) rename {threadr => src}/login/README.md (100%) rename {threadr => src}/login/index.php (100%) rename {threadr => src}/login/redirect.php (100%) rename {threadr => src}/logout/README.md (100%) rename {threadr => src}/logout/index.php (100%) rename {threadr => src}/news/README.md (100%) rename {threadr => src}/news/index.php (100%) rename {threadr => src}/profile/README.md (100%) rename {threadr => src}/profile/default.php (100%) rename {threadr => src}/profile/edit.php (100%) rename {threadr => src}/profile/index.php (100%) rename {threadr => src}/signup/README.md (100%) rename {threadr => src}/signup/index.php (100%) rename {threadr => src}/signup/verify-email/README.md (100%) rename {threadr => src}/signup/verify-email/index.php (100%) rename {threadr => src}/signup/verify-email/redirect.php (100%) rename {threadr => src}/style.css (100%) rename {threadr => src}/userhome/README.md (100%) rename {threadr => src}/userhome/index.php (100%) delete mode 100644 utf8test diff --git a/build/README.md b/build/README.md new file mode 100644 index 0000000..0df1e42 --- /dev/null +++ b/build/README.md @@ -0,0 +1 @@ +This directory is here as a placeholder for the build process. diff --git a/deployment-script.sh b/deployment-script.sh index 3f5c494..847c482 100644 --- a/deployment-script.sh +++ b/deployment-script.sh @@ -3,16 +3,20 @@ echo "Deployment script for repository \"web-deployment\" `date` ==============================================================================" -#activate ** globs +# activate ** globs if [ -n "`shopt globstar | grep off`" ]; then shopt -s globstar; fi -#remove READMEs -rm ./threadr/**/README.md +# remove READMEs +rm ./src/**/README.md +# prepare build directory tree and static files +rm -r ./build +cp -r ./src ./build +rm ./build/**.{php,html,css,svg} -#run the macro handler -echo "`find -name "*.php" -or -name "*.html" -or -name "*.css" -or -name "*.svg" | sed 's/^/python variable_grabbler.py.old /;s/$/ macros\/pass0\*.json/'`" | bash - -echo "`find -name "*.php" -or -name "*.html" -or -name "*.css" -or -name "*.svg" | sed 's/^/python variable_grabbler.py.old /;s/$/ macros\/pass1\*.json/'`" | bash - -echo "`find -name "*.php" -or -name "*.html" -or -name "*.css" -or -name "*.svg" | sed 's/^/python variable_grabbler.py.old /;s/$/ macros\/pass2\*.json/'`" | bash - -echo "`find -name "*.php" -or -name "*.html" -or -name "*.css" -or -name "*.svg" | sed 's/^/python variable_grabbler.py.old /;s/$/ macros\/pass3\*.json/'`" | bash - +# run the macro handler +echo "`cd src; find -name "*.php" -or -name "*.html" -or -name "*.css" -or -name "*.svg" | sed 's/^/file=/;s/$/\; python3 variable_grabbler.py macros\/pass0\*.json src\/$file > build\/$file/'`" | bash - +echo "`cd src; find -name "*.php" -or -name "*.html" -or -name "*.css" -or -name "*.svg" | sed 's/^/file=/;s/$/\; python3 variable_grabbler.py macros\/pass1\*.json src\/$file > build\/$file/'`" | bash - +echo "`cd src; find -name "*.php" -or -name "*.html" -or -name "*.css" -or -name "*.svg" | sed 's/^/file=/;s/$/\; python3 variable_grabbler.py macros\/pass2\*.json src\/$file > build\/$file/'`" | bash - +echo "`cd src; find -name "*.php" -or -name "*.html" -or -name "*.css" -or -name "*.svg" | sed 's/^/file=/;s/$/\; python3 variable_grabbler.py macros\/pass3\*.json src\/$file > build\/$file/'`" | bash - echo "============================================================================== Done." diff --git a/threadr/README.md b/src/README.md similarity index 100% rename from threadr/README.md rename to src/README.md diff --git a/threadr/about/README.md b/src/about/README.md similarity index 100% rename from threadr/about/README.md rename to src/about/README.md diff --git a/threadr/about/index.php b/src/about/index.php similarity index 100% rename from threadr/about/index.php rename to src/about/index.php diff --git a/threadr/accept_cookie.php b/src/accept_cookie.php similarity index 100% rename from threadr/accept_cookie.php rename to src/accept_cookie.php diff --git a/threadr/board/README.md b/src/board/README.md similarity index 100% rename from threadr/board/README.md rename to src/board/README.md diff --git a/threadr/board/board.php b/src/board/board.php similarity index 100% rename from threadr/board/board.php rename to src/board/board.php diff --git a/threadr/board/default.php b/src/board/default.php similarity index 100% rename from threadr/board/default.php rename to src/board/default.php diff --git a/threadr/board/edit.php b/src/board/edit.php similarity index 100% rename from threadr/board/edit.php rename to src/board/edit.php diff --git a/threadr/board/index.php b/src/board/index.php similarity index 100% rename from threadr/board/index.php rename to src/board/index.php diff --git a/threadr/board/post.php b/src/board/post.php similarity index 100% rename from threadr/board/post.php rename to src/board/post.php diff --git a/threadr/board/submit.php b/src/board/submit.php similarity index 100% rename from threadr/board/submit.php rename to src/board/submit.php diff --git a/threadr/boards/README.md b/src/boards/README.md similarity index 100% rename from threadr/boards/README.md rename to src/boards/README.md diff --git a/threadr/boards/index.php b/src/boards/index.php similarity index 100% rename from threadr/boards/index.php rename to src/boards/index.php diff --git a/threadr/img/README.md b/src/img/README.md similarity index 100% rename from threadr/img/README.md rename to src/img/README.md diff --git a/threadr/img/ThreadR.png b/src/img/ThreadR.png similarity index 100% rename from threadr/img/ThreadR.png rename to src/img/ThreadR.png diff --git a/threadr/img/ThreadR.svg b/src/img/ThreadR.svg similarity index 100% rename from threadr/img/ThreadR.svg rename to src/img/ThreadR.svg diff --git a/threadr/img/ThreadR_Home.svg b/src/img/ThreadR_Home.svg similarity index 100% rename from threadr/img/ThreadR_Home.svg rename to src/img/ThreadR_Home.svg diff --git a/threadr/img/favicon-32x32.png b/src/img/favicon-32x32.png similarity index 100% rename from threadr/img/favicon-32x32.png rename to src/img/favicon-32x32.png diff --git a/threadr/img/index.html b/src/img/index.html similarity index 100% rename from threadr/img/index.html rename to src/img/index.html diff --git a/threadr/img/threadR.png b/src/img/threadR.png similarity index 100% rename from threadr/img/threadR.png rename to src/img/threadR.png diff --git a/threadr/index.php b/src/index.php similarity index 100% rename from threadr/index.php rename to src/index.php diff --git a/threadr/login/README.md b/src/login/README.md similarity index 100% rename from threadr/login/README.md rename to src/login/README.md diff --git a/threadr/login/index.php b/src/login/index.php similarity index 100% rename from threadr/login/index.php rename to src/login/index.php diff --git a/threadr/login/redirect.php b/src/login/redirect.php similarity index 100% rename from threadr/login/redirect.php rename to src/login/redirect.php diff --git a/threadr/logout/README.md b/src/logout/README.md similarity index 100% rename from threadr/logout/README.md rename to src/logout/README.md diff --git a/threadr/logout/index.php b/src/logout/index.php similarity index 100% rename from threadr/logout/index.php rename to src/logout/index.php diff --git a/threadr/news/README.md b/src/news/README.md similarity index 100% rename from threadr/news/README.md rename to src/news/README.md diff --git a/threadr/news/index.php b/src/news/index.php similarity index 100% rename from threadr/news/index.php rename to src/news/index.php diff --git a/threadr/profile/README.md b/src/profile/README.md similarity index 100% rename from threadr/profile/README.md rename to src/profile/README.md diff --git a/threadr/profile/default.php b/src/profile/default.php similarity index 100% rename from threadr/profile/default.php rename to src/profile/default.php diff --git a/threadr/profile/edit.php b/src/profile/edit.php similarity index 100% rename from threadr/profile/edit.php rename to src/profile/edit.php diff --git a/threadr/profile/index.php b/src/profile/index.php similarity index 100% rename from threadr/profile/index.php rename to src/profile/index.php diff --git a/threadr/signup/README.md b/src/signup/README.md similarity index 100% rename from threadr/signup/README.md rename to src/signup/README.md diff --git a/threadr/signup/index.php b/src/signup/index.php similarity index 100% rename from threadr/signup/index.php rename to src/signup/index.php diff --git a/threadr/signup/verify-email/README.md b/src/signup/verify-email/README.md similarity index 100% rename from threadr/signup/verify-email/README.md rename to src/signup/verify-email/README.md diff --git a/threadr/signup/verify-email/index.php b/src/signup/verify-email/index.php similarity index 100% rename from threadr/signup/verify-email/index.php rename to src/signup/verify-email/index.php diff --git a/threadr/signup/verify-email/redirect.php b/src/signup/verify-email/redirect.php similarity index 100% rename from threadr/signup/verify-email/redirect.php rename to src/signup/verify-email/redirect.php diff --git a/threadr/style.css b/src/style.css similarity index 100% rename from threadr/style.css rename to src/style.css diff --git a/threadr/userhome/README.md b/src/userhome/README.md similarity index 100% rename from threadr/userhome/README.md rename to src/userhome/README.md diff --git a/threadr/userhome/index.php b/src/userhome/index.php similarity index 100% rename from threadr/userhome/index.php rename to src/userhome/index.php diff --git a/utf8test b/utf8test deleted file mode 100644 index 8d8a4e5..0000000 --- a/utf8test +++ /dev/null @@ -1,4 +0,0 @@ -öüpäövrewbv - -erbgvöer45675)$%&§=) -**’’¯¯