Skip to content

Commit

Permalink
Merge pull request #53 from BoyCook/master
Browse files Browse the repository at this point in the history
Updated bld.sh to check for $JERMOLENE_HOME instead of using hardcoded value
  • Loading branch information
Jeremy Ruston committed Jan 22, 2013
2 parents 8bc522d + dbe751f commit 7effc49
Showing 1 changed file with 16 additions and 6 deletions.
22 changes: 16 additions & 6 deletions bld.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,25 @@

pushd editions/tw5.com > /dev/null

echo "five.tiddlywiki.com" > ../../../jermolene.github.com/CNAME
if [ -z "$JERMOLENE_HOME" ]; then
JERMOLENE_HOME=../../../jermolene.github.com
fi

if [ ! -d "$JERMOLENE_HOME" ]; then
echo 'A valid JERMOLENE_HOME directory must be set'
exit 1
fi

echo "Using JERMOLENE_HOME as [$JERMOLENE_HOME]"
echo "five.tiddlywiki.com" > $JERMOLENE_HOME/CNAME

node ../../tiddlywiki.js \
--verbose \
--password password \
--savetiddler ReadMe ../../readme.md text/html \
--savetiddler $:/core/templates/tiddlywiki5.template.html ../../../jermolene.github.com/index.html text/plain \
--savetiddler $:/core/templates/tiddlywiki5.encrypted.template.html ../../../jermolene.github.com/encrypted.html text/plain \
--savetiddler $:/core/templates/static.template.html ../../../jermolene.github.com/static.html text/plain \
--savetiddler $:/core/templates/tiddlywiki5.template.html $JERMOLENE_HOME/index.html text/plain \
--savetiddler $:/core/templates/tiddlywiki5.encrypted.template.html $JERMOLENE_HOME/encrypted.html text/plain \
--savetiddler $:/core/templates/static.template.html $JERMOLENE_HOME/static.html text/plain \
|| exit 1

popd > /dev/null
Expand All @@ -26,8 +36,8 @@ pushd editions/empty > /dev/null
node ../../tiddlywiki.js \
--verbose \
--password password \
--savetiddler $:/core/templates/tiddlywiki5.template.html ../../../jermolene.github.com/empty.html text/plain \
--savetiddler $:/core/templates/tiddlywiki5.encrypted.template.html ../../../jermolene.github.com/empty_encrypted.html text/plain \
--savetiddler $:/core/templates/tiddlywiki5.template.html $JERMOLENE_HOME/empty.html text/plain \
--savetiddler $:/core/templates/tiddlywiki5.encrypted.template.html $JERMOLENE_HOME/empty_encrypted.html text/plain \
|| exit 1

popd > /dev/null

0 comments on commit 7effc49

Please sign in to comment.