Update batch files to specify wikipath

2bld.sh

@@ -6,27 +6,21 @@
 mkdir -p tmp
 mkdir -p tmp/tw2
 
-# Prepare the readme file from the revelant content in the tw5.com content
+# Prepare the readme file from the revelant content in the tw5.com wiki
 
-pushd editions/tw5.com > /dev/null
+node ./tiddlywiki.js \
-
+	editions/tw5.com \
-node ../../tiddlywiki.js \
 	--verbose \
-	--savetiddler TiddlyWiki2ReadMe ../tw2/readme.md text/html \
+	--savetiddler TiddlyWiki2ReadMe editions/tw2/readme.md text/html \
 	|| exit 1
 
-popd > /dev/null
-
 # cook the TiddlyWiki 2.x.x index file
 
-pushd editions/tw2 > /dev/null
+node ./tiddlywiki.js \
-
+	editions/tw2 \
-node ../../tiddlywiki.js \
 	--verbose \
-	--load source/tiddlywiki.com/index.html.recipe \
+	--load editions/tw2/source/tiddlywiki.com/index.html.recipe \
-	--savetiddler $:/core/templates/tiddlywiki2.template.html ../../tmp/tw2/index.html text/plain \
+	--savetiddler $:/core/templates/tiddlywiki2.template.html ./tmp/tw2/index.html text/plain \
 	|| exit 1
 
-popd > /dev/null
-
 opendiff tmp/tw2/index.html editions/tw2/target/index.2.6.5.html

bld.sh

@@ -2,12 +2,10 @@
 
 # build TiddlyWiki5 for five.tiddlywiki.com
 
-pushd editions/tw5.com > /dev/null
-
 # Set up the build output directory
 
 if [  -z "$TW5_BUILD_OUTPUT" ]; then
-    TW5_BUILD_OUTPUT=../../../jermolene.github.com
+    TW5_BUILD_OUTPUT=../jermolene.github.com
 fi
 
 if [  ! -d "$TW5_BUILD_OUTPUT" ]; then
@@ -26,30 +24,28 @@ echo "five.tiddlywiki.com" > $TW5_BUILD_OUTPUT/CNAME
 #  index.html: the main file, including content
 #  static.html: the static version of the default tiddlers
 
-node ../../tiddlywiki.js \
+node ./tiddlywiki.js \
+	./editions/tw5.com \
 	--verbose \
-	--savetiddler ReadMe ../../readme.md text/html \
+	--savetiddler ReadMe ./readme.md text/html \
 	--savetiddler $:/core/templates/tiddlywiki5.template.html $TW5_BUILD_OUTPUT/index.html text/plain \
 	--savetiddler $:/core/templates/static.template.html $TW5_BUILD_OUTPUT/static.html text/plain \
 	|| exit 1
 
 # Second, encrypted.html: a version of the main file encrypted with the password "password"
 
-node ../../tiddlywiki.js \
+node ./tiddlywiki.js \
+	./editions/tw5.com \
 	--verbose \
 	--password password \
 	--savetiddler $:/core/templates/tiddlywiki5.template.html $TW5_BUILD_OUTPUT/encrypted.html text/plain \
 	|| exit 1
 
-popd > /dev/null
-
 # Third, empty.html: empty wiki for reuse
 
-pushd editions/empty > /dev/null
+node ./tiddlywiki.js \
-
+	./editions/tw5.com \
-node ../../tiddlywiki.js \
 	--verbose \
 	--savetiddler $:/core/templates/tiddlywiki5.template.html $TW5_BUILD_OUTPUT/empty.html text/plain \
 	|| exit 1
 
-popd > /dev/null

serve.sh

@@ -2,11 +2,8 @@
 
 # serve TiddlyWiki5 over HTTP
 
-pushd editions/tw5.com > /dev/null
+node ./tiddlywiki.js \
-
+	editions/tw5.com \
-node ../../tiddlywiki.js \
 	--verbose \
 	--server 8080 $:/core/templates/tiddlywiki5.template.html text/plain text/html \
 	|| exit 1
-
-popd > /dev/null