From e65cb93fa2c18c63a8a7d9e1adee877c2a2e7099 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Thu, 29 Nov 2012 21:30:53 +0000
Subject: [PATCH] Batch file cleanups

---
 .gitignore    | 1 -
 2bld.sh       | 2 +-
 bld.sh        | 4 ++--
 dbld.sh       | 4 ++--
 run.sh        | 2 +-
 serve.sh      | 2 +-
 tiddlywiki.js | 2 +-
 wbld.sh       | 4 +++-
 8 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2f1532af2..63e98d103 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 .DS_Store
 tmp/
-archive/tmp/
diff --git a/2bld.sh b/2bld.sh
index 8cb5ce93f..f5df9695c 100755
--- a/2bld.sh
+++ b/2bld.sh
@@ -10,7 +10,7 @@ mkdir -p tmp/tw2
 
 pushd editions/tw2 > /dev/null
 
-node ../../core/boot.js \
+node ../../tiddlywiki.js \
 	--verbose \
 	--load source/tiddlywiki.com/index.html.recipe \
 	--savetiddler $:/core/templates/tiddlywiki2.template.html ../../tmp/tw2/index.html text/plain \
diff --git a/bld.sh b/bld.sh
index 17509352e..1cedaa1d0 100755
--- a/bld.sh
+++ b/bld.sh
@@ -8,7 +8,7 @@ pushd editions/tw5.com > /dev/null
 
 echo "five.tiddlywiki.com" > ../../../jermolene.github.com/CNAME
 
-node ../../core/boot.js \
+node ../../tiddlywiki.js \
 	--verbose \
 	--password password \
 	--savetiddler ReadMe ../../readme.md text/html \
@@ -23,7 +23,7 @@ popd > /dev/null
 
 pushd editions/empty > /dev/null
 
-node ../../core/boot.js \
+node ../../tiddlywiki.js \
 	--verbose \
 	--password password \
 	--savetiddler $:/core/templates/tiddlywiki5.template.html ../../../jermolene.github.com/empty.html text/plain \
diff --git a/dbld.sh b/dbld.sh
index a1ea5be6a..86642dc29 100755
--- a/dbld.sh
+++ b/dbld.sh
@@ -11,7 +11,7 @@ cp tw5dropbox/dummycontent/*.* ../../../Apps/TiddlyWiki5/My\ TiddlyWiki/tiddlers
 
 pushd editions/tw5dropbox/appwiki > /dev/null
 
-node ../../../core/boot.js \
+node ../../tiddlywiki.js \
 	--verbose \
 	--savetiddler $:/plugins/dropbox/tw5dropbox.template.js ../../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/tw5dropbox.js text/plain \
 	--savetiddler $:/plugins/dropbox/index.template.html ../../../../../../Apps/TiddlyWiki5/My\ TiddlyWiki/index.html text/plain \
@@ -25,7 +25,7 @@ popd > /dev/null
 
 pushd editions/tw5dropbox/mainwiki > /dev/null
 
-node ../../../core/boot.js \
+node ../../tiddlywiki.js \
 	--verbose \
 	--savetiddler $:/plugins/dropbox/index.template.html ../../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/index.html text/plain \
 	|| exit 1
diff --git a/run.sh b/run.sh
index da501d737..99a7d75ae 100755
--- a/run.sh
+++ b/run.sh
@@ -4,7 +4,7 @@
 
 pushd editions/tw5.com > /dev/null
 
-node ../../core/boot.js \
+node ../../tiddlywiki.js \
 	--verbose \
 	--wikitest ../../tests/wikitests/ \
 	|| exit 1
diff --git a/serve.sh b/serve.sh
index 9a19f7fba..96191a127 100755
--- a/serve.sh
+++ b/serve.sh
@@ -4,7 +4,7 @@
 
 pushd editions/tw5.com > /dev/null
 
-node ../../core/boot.js \
+node ../../tiddlywiki.js \
 	--verbose \
 	--server 8080 $:/core/templates/tiddlywiki5.template.html text/plain text/html \
 	|| exit 1
diff --git a/tiddlywiki.js b/tiddlywiki.js
index 23a757c9a..422d238a7 100755
--- a/tiddlywiki.js
+++ b/tiddlywiki.js
@@ -4,4 +4,4 @@
 This is invoked as a shell script by NPM when the `tiddlywiki` command is typed
 */
 
-var tiddlywiki = require("./boot.js");
+var tiddlywiki = require("./core/boot.js");
diff --git a/wbld.sh b/wbld.sh
index 5aa02762c..2a08a43b0 100755
--- a/wbld.sh
+++ b/wbld.sh
@@ -7,7 +7,7 @@
 
 pushd editions/tw5tiddlyweb > /dev/null
 
-node ../../core/boot.js \
+node ../../tiddlywiki.js \
 	--verbose \
 	--savetiddler $:/core/templates/tiddlywiki5.template.html ../../../jermolene.github.com/tiddlyweb.html text/plain \
 	|| exit 1
@@ -20,3 +20,5 @@ echo "" >> tmp/tmp.txt
 cat ../jermolene.github.com/tiddlyweb.html >> tmp/tmp.txt
 
 curl -u $1:$2 -X PUT -H "content-type: text/plain" http://tw5tiddlyweb.tiddlyspace.com/bags/tw5tiddlyweb_public/tiddlers/tw5 --data-binary @tmp/tmp.txt
+
+rm tmp/tmp.txt