From 077e46be878f3081e8773832fb6c05f8615c2455 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Sat, 9 Feb 2013 17:08:19 +0000
Subject: [PATCH] Update batch files to specify wikipath

---
 2bld.sh  | 22 ++++++++--------------
 bld.sh   | 20 ++++++++------------
 serve.sh |  7 ++-----
 3 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/2bld.sh b/2bld.sh
index 305c0944d..c4bc230bf 100755
--- a/2bld.sh
+++ b/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 \
+node ./tiddlywiki.js \
+	editions/tw5.com \
 	--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 \
+node ./tiddlywiki.js \
+	editions/tw2 \
 	--verbose \
-	--load source/tiddlywiki.com/index.html.recipe \
-	--savetiddler $:/core/templates/tiddlywiki2.template.html ../../tmp/tw2/index.html text/plain \
+	--load editions/tw2/source/tiddlywiki.com/index.html.recipe \
+	--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
diff --git a/bld.sh b/bld.sh
index 002377747..6494bc7c2 100755
--- a/bld.sh
+++ b/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 \
+node ./tiddlywiki.js \
+	./editions/tw5.com \
 	--verbose \
 	--savetiddler $:/core/templates/tiddlywiki5.template.html $TW5_BUILD_OUTPUT/empty.html text/plain \
 	|| exit 1
 
-popd > /dev/null
diff --git a/serve.sh b/serve.sh
index 96191a127..e09b02c37 100755
--- a/serve.sh
+++ b/serve.sh
@@ -2,11 +2,8 @@
 
 # serve TiddlyWiki5 over HTTP
 
-pushd editions/tw5.com > /dev/null
-
-node ../../tiddlywiki.js \
+node ./tiddlywiki.js \
+	editions/tw5.com \
 	--verbose \
 	--server 8080 $:/core/templates/tiddlywiki5.template.html text/plain text/html \
 	|| exit 1
-
-popd > /dev/null