From 814353d8cefdd9f24e555005a730530523d72dce Mon Sep 17 00:00:00 2001 From: Jermolene Date: Tue, 29 Sep 2015 17:04:01 +0100 Subject: [PATCH] Fix accidental inconsistency between savetiddlers and rendertiddlers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit “-do-not-delete” flag for savetiddlers command was introduced in 5.1.10 without consistency with the already implemented “noclean” flag for the rendertiddlers command --- core/language/en-GB/Help/rendertiddlers.tid | 2 +- core/language/en-GB/Help/savetiddlers.tid | 4 ++-- core/modules/commands/rendertiddlers.js | 2 +- core/modules/commands/savetiddlers.js | 4 ++-- languages/zh-Hans/Help/savetiddlers.tid | 4 ++-- languages/zh-Hant/Help/savetiddlers.tid | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core/language/en-GB/Help/rendertiddlers.tid b/core/language/en-GB/Help/rendertiddlers.tid index cb982efb3..69f4e0a38 100644 --- a/core/language/en-GB/Help/rendertiddlers.tid +++ b/core/language/en-GB/Help/rendertiddlers.tid @@ -15,4 +15,4 @@ For example: By default, the pathname is resolved relative to the `output` subdirectory of the edition directory. The `--output` command can be used to direct output to a different directory. -Any files in the target directory are deleted unless the "noclean" parameter is specified. The target directory is recursively created if it is missing. +Any files in the target directory are deleted unless the ''noclean'' flag is specified. The target directory is recursively created if it is missing. diff --git a/core/language/en-GB/Help/savetiddlers.tid b/core/language/en-GB/Help/savetiddlers.tid index e327ceec3..37bb10e5a 100644 --- a/core/language/en-GB/Help/savetiddlers.tid +++ b/core/language/en-GB/Help/savetiddlers.tid @@ -4,11 +4,11 @@ description: Saves a group of raw tiddlers to a directory Saves a group of tiddlers in their raw text or binary format to the specified directory. ``` ---savetiddlers [-do-not-delete] +--savetiddlers ["noclean"] ``` By default, the pathname is resolved relative to the `output` subdirectory of the edition directory. The `--output` command can be used to direct output to a different directory. -The output directory is cleared of existing files before saving the specified files. The deletion can be disabled by specifying the ''-do-not-delete'' flag. +The output directory is cleared of existing files before saving the specified files. The deletion can be disabled by specifying the ''noclean'' flag. Any missing directories in the pathname are automatically created. diff --git a/core/modules/commands/rendertiddlers.js b/core/modules/commands/rendertiddlers.js index bcd2f0173..dd875e3eb 100644 --- a/core/modules/commands/rendertiddlers.js +++ b/core/modules/commands/rendertiddlers.js @@ -39,7 +39,7 @@ Command.prototype.execute = function() { pathname = path.resolve(outputPath,this.params[2]), type = this.params[3] || "text/html", extension = this.params[4] || ".html", - deleteDirectory = (this.params[5] || "") != "noclean", + deleteDirectory = (this.params[5] || "").toLowerCase() !== "noclean", tiddlers = wiki.filterTiddlers(filter); if(deleteDirectory) { $tw.utils.deleteDirectory(pathname); diff --git a/core/modules/commands/savetiddlers.js b/core/modules/commands/savetiddlers.js index fdb5940c1..de29efdb7 100644 --- a/core/modules/commands/savetiddlers.js +++ b/core/modules/commands/savetiddlers.js @@ -35,9 +35,9 @@ Command.prototype.execute = function() { wiki = this.commander.wiki, filter = this.params[0], pathname = path.resolve(this.commander.outputPath,this.params[1]), - dontDelete = (this.params[2] || "").toLowerCase() === "-do-not-delete", + deleteDirectory = (this.params[2] || "").toLowerCase() !== "noclean", tiddlers = wiki.filterTiddlers(filter); - if(!dontDelete) { + if(deleteDirectory) { $tw.utils.deleteDirectory(pathname); } $tw.utils.createDirectory(pathname); diff --git a/languages/zh-Hans/Help/savetiddlers.tid b/languages/zh-Hans/Help/savetiddlers.tid index 17bad7b1c..ae5d5f7ce 100644 --- a/languages/zh-Hans/Help/savetiddlers.tid +++ b/languages/zh-Hans/Help/savetiddlers.tid @@ -4,11 +4,11 @@ description: 将一群条目的原始内容保存到一个文件夹 保存一群条目的原始文字或二进制格式到指定的文件夹。 ``` ---savetiddlers [-do-not-delete] +--savetiddlers [noclean] ``` 默认情况下，路径名被解析为相对于版本文件夹的 `output` 子文件夹。 `--output` 命令可以用于将输出指定到一个不同的文件夹。 -保存指定的文件之前，会先清除输出目录的现有文件。可藉由指定 `-do-not-delete` 旗标，禁用该删除动作。 +保存指定的文件之前，会先清除输出目录的现有文件。可藉由指定 `noclean` 旗标，禁用该删除动作。 自动创建在路径中任何缺少的文件夹。 diff --git a/languages/zh-Hant/Help/savetiddlers.tid b/languages/zh-Hant/Help/savetiddlers.tid index 2d13d78f3..8d711b951 100644 --- a/languages/zh-Hant/Help/savetiddlers.tid +++ b/languages/zh-Hant/Help/savetiddlers.tid @@ -4,11 +4,11 @@ description: 將一群條目的原始內容儲存到一個資料夾 儲存一群條目的原始文字或二進位格式到指定的資料夾。 ``` ---savetiddlers [-do-not-delete] +--savetiddlers [noclean] ``` 預設情況下，路徑名被解析為相對於版本資料夾的 `output` 子資料夾。 `--output` 命令可以用於將輸出指定到一個不同的資料夾。 -儲存指定的檔案之前，會先清除輸出目錄的現有檔案。可藉由指定 `-do-not-delete` 旗標，停用該刪除動作。 +儲存指定的檔案之前，會先清除輸出目錄的現有檔案。可藉由指定 `noclean` 旗標，停用該刪除動作。 自動建立在路徑中任何缺少的資料夾。