Batch file cleanups

.gitignore

@@ -1,3 +1,2 @@
 .DS_Store
 tmp/
-archive/tmp/

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 \

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 \

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

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

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

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");

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