From 5951dc5901c9794a5c2722655699c1238d6a00ad Mon Sep 17 00:00:00 2001 From: Jermolene Date: Fri, 16 May 2014 14:39:24 +0100 Subject: [PATCH] Fix problem with static renderings The issue was that rendertiddlers always clears the output folder, which meant that it was overwriting anything previously output by the rendertiddler command. --- bld.cmd | 2 +- bld.sh | 2 +- .../tiddlers/howtos/Notes for upgrading to 5.0.11-beta.tid | 2 ++ editions/tw5.com/tiddlywiki.info | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bld.cmd b/bld.cmd index 8beae71e9..21eeda398 100644 --- a/bld.cmd +++ b/bld.cmd @@ -45,8 +45,8 @@ node .\tiddlywiki.js ^ --savetiddler $:/green_favicon.ico %TW5_BUILD_OUTPUT%/static/favicon.ico ^ --rendertiddler $:/core/templates/static.template.html static.html text/plain ^ --rendertiddler $:/core/templates/alltiddlers.template.html alltiddlers.html text/plain ^ - --rendertiddler $:/core/templates/static.template.css static\static.css text/plain ^ --rendertiddlers [!is[system]] $:/core/templates/static.tiddler.html static text/plain ^ + --rendertiddler $:/core/templates/static.template.css static\static.css text/plain ^ || exit 1 rem encrypted.html: a version of the main file encrypted with the password "password" diff --git a/bld.sh b/bld.sh index 7799dddf9..32f07795c 100755 --- a/bld.sh +++ b/bld.sh @@ -46,8 +46,8 @@ node ./tiddlywiki.js \ --savetiddler $:/green_favicon.ico static/favicon.ico \ --rendertiddler $:/core/templates/static.template.html static.html text/plain \ --rendertiddler $:/core/templates/alltiddlers.template.html alltiddlers.html text/plain \ - --rendertiddler $:/core/templates/static.template.css static/static.css text/plain \ --rendertiddlers [!is[system]] $:/core/templates/static.tiddler.html static text/plain \ + --rendertiddler $:/core/templates/static.template.css static/static.css text/plain \ || exit 1 # encrypted.html: a version of the main file encrypted with the password "password" diff --git a/editions/tw5.com/tiddlers/howtos/Notes for upgrading to 5.0.11-beta.tid b/editions/tw5.com/tiddlers/howtos/Notes for upgrading to 5.0.11-beta.tid index 7c80a09bb..101c8da1e 100644 --- a/editions/tw5.com/tiddlers/howtos/Notes for upgrading to 5.0.11-beta.tid +++ b/editions/tw5.com/tiddlers/howtos/Notes for upgrading to 5.0.11-beta.tid @@ -21,3 +21,5 @@ You can override this behaviour with the OutputCommand. For example, to generate ``` tiddlywiki mywiki --output . --rendertiddler $:/core/save/all index.html text/plain ``` + +A further change is that the `--rendertiddlers` command now clears the output folder before it writes any files. This means that any previous `--rendertiddler` commands to the same folder will have their output deleted. diff --git a/editions/tw5.com/tiddlywiki.info b/editions/tw5.com/tiddlywiki.info index d3049654f..14ef45476 100644 --- a/editions/tw5.com/tiddlywiki.info +++ b/editions/tw5.com/tiddlywiki.info @@ -48,8 +48,8 @@ "static": [ "--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain", "--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain", - "--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain", - "--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain"] + "--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain", + "--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"] }, "config": { "retain-original-tiddler-path": true