Cleaning up batch file locations

This commit is contained in:
Jeremy Ruston 2012-05-05 23:32:04 +01:00
parent a99f34fcae
commit cce472789d
4 changed files with 32 additions and 17 deletions

2
.gitignore vendored
View File

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

14
bld.sh
View File

@ -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

29
run.sh
View File

@ -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

View File

@ -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"