1
0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-12-24 17:10:29 +00:00

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.
This commit is contained in:
Jermolene 2014-05-16 14:39:24 +01:00
parent 1d15e4b7d3
commit 5951dc5901
4 changed files with 6 additions and 4 deletions

View File

@ -45,8 +45,8 @@ node .\tiddlywiki.js ^
--savetiddler $:/green_favicon.ico %TW5_BUILD_OUTPUT%/static/favicon.ico ^ --savetiddler $:/green_favicon.ico %TW5_BUILD_OUTPUT%/static/favicon.ico ^
--rendertiddler $:/core/templates/static.template.html static.html text/plain ^ --rendertiddler $:/core/templates/static.template.html static.html text/plain ^
--rendertiddler $:/core/templates/alltiddlers.template.html alltiddlers.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 ^
|| exit 1 || exit 1
rem encrypted.html: a version of the main file encrypted with the password "password" rem encrypted.html: a version of the main file encrypted with the password "password"

2
bld.sh
View File

@ -46,8 +46,8 @@ node ./tiddlywiki.js \
--savetiddler $:/green_favicon.ico static/favicon.ico \ --savetiddler $:/green_favicon.ico static/favicon.ico \
--rendertiddler $:/core/templates/static.template.html static.html text/plain \ --rendertiddler $:/core/templates/static.template.html static.html text/plain \
--rendertiddler $:/core/templates/alltiddlers.template.html alltiddlers.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 \
|| exit 1 || exit 1
# encrypted.html: a version of the main file encrypted with the password "password" # encrypted.html: a version of the main file encrypted with the password "password"

View File

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

View File

@ -48,8 +48,8 @@
"static": [ "static": [
"--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain", "--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain",
"--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.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": { "config": {
"retain-original-tiddler-path": true "retain-original-tiddler-path": true