From cce472789d2512c5d78ea1fb096a39be031dfca0 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Sat, 5 May 2012 23:32:04 +0100
Subject: [PATCH] Cleaning up batch file locations

---
 .gitignore |  2 +-
 bld.sh     | 14 +++++++++++---
 run.sh     | 29 ++++++++++++++++++-----------
 upload.sh  |  4 ++--
 4 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 968be4e4c..2f1532af2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 .DS_Store
 tmp/
-rabbithole/tmp/
+archive/tmp/
diff --git a/bld.sh b/bld.sh
index 004bcd032..55afc03a9 100755
--- a/bld.sh
+++ b/bld.sh
@@ -7,7 +7,15 @@ mkdir -p tmp
 mkdir -p tmp/tw5
 
 # cook TiddlyWiki5
-node ../core/boot.js --verbose \
+
+
+pushd tw5.com > /dev/null
+
+node ../core/boot.js \
+	--verbose \
 	--savetiddler ReadMe ../readme.md text/html \
-	--savetiddler $:/core/tiddlywiki5.template.html tmp/tw5/index.html text/plain \
-	--savetiddler $:/core/static.template.html tmp/tw5/static.html text/plain || exit 1
+	--savetiddler $:/core/tiddlywiki5.template.html ../tmp/tw5/index.html text/plain \
+	--savetiddler $:/core/static.template.html ../tmp/tw5/static.html text/plain \
+	|| exit 1
+
+popd > /dev/null
diff --git a/run.sh b/run.sh
index 18340a76f..3c69293f9 100755
--- a/run.sh
+++ b/run.sh
@@ -2,16 +2,23 @@
 
 # run TiddlyWiki5
 
-node ../core/boot.js --verbose --wikitest ../tests/wikitests/ || exit 1
+pushd tw5.com > /dev/null
+
+node ../core/boot.js \
+	--verbose \
+	--wikitest ../tests/wikitests/ \
+	|| exit 1
+
+popd > /dev/null
 
 # run jshint
-jshint ../core/*.js
-jshint ../core/modules/*.js
-jshint ../core/modules/commands/*.js
-jshint ../core/modules/macros/*.js
-jshint ../core/modules/macros/edit/*.js
-jshint ../core/modules/macros/edit/editors/*.js
-jshint ../core/modules/parsers/*.js
-jshint ../core/modules/parsers/wikitextparser/*.js
-jshint ../core/modules/parsers/wikitextparser/rules/*.js
-jshint ../core/modules/treenodes/*.js
+jshint ./core/*.js
+jshint ./core/modules/*.js
+jshint ./core/modules/commands/*.js
+jshint ./core/modules/macros/*.js
+jshint ./core/modules/macros/edit/*.js
+jshint ./core/modules/macros/edit/editors/*.js
+jshint ./core/modules/parsers/*.js
+jshint ./core/modules/parsers/wikitextparser/*.js
+jshint ./core/modules/parsers/wikitextparser/rules/*.js
+jshint ./core/modules/treenodes/*.js
diff --git a/upload.sh b/upload.sh
index 438e7204a..50af139d0 100755
--- a/upload.sh
+++ b/upload.sh
@@ -7,7 +7,7 @@
 
 # default values
 REMOTE_USER=${1:-$USER}
-FROMDIR=$PWD/../tmp/tw5
+FROMDIR=$PWD/tmp/tw5
 HOST="tiddlywiki.com"
 DIR="/var/www/www.tiddlywiki.com/htdocs/tiddlywiki5"
 OWNER="www-data:www-data"
@@ -23,7 +23,7 @@ function setPermissions() {
 
 echo "uploading files"
 
-FILES="$FROMDIR/index.html $FROMDIR/index.xml"
+FILES="$FROMDIR/index.html $FROMDIR/static.html"
 scp $FILES "$REMOTE_USER@$HOST:$DIR"
 
 echo "setting file permissions"