fixed #51 to make the new variable grabbler work properly

build/README.md

@@ -0,0 +1 @@
+This directory is here as a placeholder for the build process.

deployment-script.sh

@@ -6,13 +6,17 @@ echo "Deployment script for repository \"web-deployment\"
 # activate ** globs
 if [ -n "`shopt globstar | grep off`" ]; then shopt -s globstar; fi
 # remove READMEs
-rm ./threadr/**/README.md
+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 -
+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."

utf8test

@@ -1,4 +0,0 @@
-öüpäövrewbv
-
-erbgvöer45675)$%&§=)
-**’’¯¯