From e6195e424c0d7288826c0ff08f2221767efb9d78 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Fri, 4 May 2012 17:47:12 +0100
Subject: [PATCH] Moved tw5.com scripts into the tw5.com directory

---
 rabbithole/run.sh                  | 5 -----
 rabbithole/{ => tw5.com}/bld.sh    | 8 ++++----
 rabbithole/tw5.com/run.sh          | 5 +++++
 rabbithole/{ => tw5.com}/upload.sh | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100755 rabbithole/run.sh
 rename rabbithole/{ => tw5.com}/bld.sh (57%)
 create mode 100755 rabbithole/tw5.com/run.sh
 rename rabbithole/{ => tw5.com}/upload.sh (96%)

diff --git a/rabbithole/run.sh b/rabbithole/run.sh
deleted file mode 100755
index 8fd14d4df..000000000
--- a/rabbithole/run.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# run TiddlyWiki5
-
-node core/boot.js --verbose --wikitest ../test/wikitests/ --dump shadows || exit 1
diff --git a/rabbithole/bld.sh b/rabbithole/tw5.com/bld.sh
similarity index 57%
rename from rabbithole/bld.sh
rename to rabbithole/tw5.com/bld.sh
index 4798d4c97..fe8f45c13 100755
--- a/rabbithole/bld.sh
+++ b/rabbithole/tw5.com/bld.sh
@@ -7,8 +7,8 @@ mkdir -p tmp
 mkdir -p tmp/tw5
 
 # cook TiddlyWiki5
-node ../tiddlywiki.js \
-	--recipe $PWD/tw5.com/tw5.com.recipe \
-	--store tw5.com/store \
-	--savewiki tmp/tw5 \
+node ../../tiddlywiki.js \
+	--recipe $PWD/tw5.com.recipe \
+	--store tiddlers \
+	--savewiki ../tmp/tw5 \
 	|| exit 1
diff --git a/rabbithole/tw5.com/run.sh b/rabbithole/tw5.com/run.sh
new file mode 100755
index 000000000..c104a277d
--- /dev/null
+++ b/rabbithole/tw5.com/run.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# run TiddlyWiki5
+
+node ../core/boot.js --verbose --wikitest ../../test/wikitests/ --dump shadows || exit 1
diff --git a/rabbithole/upload.sh b/rabbithole/tw5.com/upload.sh
similarity index 96%
rename from rabbithole/upload.sh
rename to rabbithole/tw5.com/upload.sh
index a3b2e0067..438e7204a 100755
--- a/rabbithole/upload.sh
+++ b/rabbithole/tw5.com/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"