From 86441e9618f1e39e80fad741ebe1aa1587d8acca Mon Sep 17 00:00:00 2001 From: "Soren I. Bjornstad" Date: Tue, 21 Sep 2021 20:44:12 -0500 Subject: [PATCH] don't carry FileSystemPaths into emptified edition Better for people to set up their own scheme if they want one, and it avoids tiddlers potentially being in two different places (since FileSystemPaths isn't honored during an init/savewikifolder). --- docs/index.html | 13 ------------- tzk/builders.py | 4 ++-- .../tzk/tiddlers/$__config_FileSystemPaths.tid | 15 --------------- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 tzk/editions/tzk/tiddlers/$__config_FileSystemPaths.tid diff --git a/docs/index.html b/docs/index.html index f4bed77..43b8b93 100644 --- a/docs/index.html +++ b/docs/index.html @@ -234,8 +234,6 @@ Error message and password prompt
  • $:/config/EditTabIndex
  • -
  • $:/config/FileSystemPaths
  • -
  • $:/config/flibbles/relink/fields/bibliography
  • $:/config/flibbles/relink/fields/description
  • @@ -991,17 +989,6 @@ Error message and password prompt
    1
    -
    -
    [is[system]removeprefix[$:/]addprefix[_system/]]
    -[tag[Template]tag[Meta]tag[Tool]addprefix[_meta/]]
    -[tag[Image]tag[Attachment]addprefix[media/]]
    -[tag[Journal]addprefix[journal/]]
    -[tag[Source]addprefix[source/]]
    -[tag[Sink]addprefix[sink/]]
    -[tag[PAO]addprefix[pao/]]
    -[tag[Place]addprefix[place/]]
    -[tag[Publication]tag[Class]addprefix[metasource/]]
    -
    list
    diff --git a/tzk/builders.py b/tzk/builders.py index 6279c43..f8d369e 100644 --- a/tzk/builders.py +++ b/tzk/builders.py @@ -188,13 +188,13 @@ def check_for_kill_phrases(kill_phrase_file: str = None) -> None: :param kill_phrase_file: The path from the source wiki's root directory to the config tiddler containing kill phrases. In the default Zettelkasten edition, this is - tiddlers/_system/config/zettelkasten/Build/KillPhrases.tid; + "tiddlers/$__config_zettelkasten_Build_KillPhrases.tid"; if you change the way paths are determined, you can give a different path here. """ assert 'public_wiki_folder' in build_state, "new_output_folder builder must run first" if kill_phrase_file is None: - kill_phrase_file = "tiddlers/_system/config/zettelkasten/Build/KillPhrases.tid" + kill_phrase_file = "tiddlers/$__config_zettelkasten_Build_KillPhrases.tid" kill_phrases = set() with open(kill_phrase_file) as f: diff --git a/tzk/editions/tzk/tiddlers/$__config_FileSystemPaths.tid b/tzk/editions/tzk/tiddlers/$__config_FileSystemPaths.tid deleted file mode 100644 index 12962bc..0000000 --- a/tzk/editions/tzk/tiddlers/$__config_FileSystemPaths.tid +++ /dev/null @@ -1,15 +0,0 @@ -created: 20200427015719697 -modified: 20200427020204931 -tags: -title: $:/config/FileSystemPaths -type: text/vnd.tiddlywiki - -[is[system]removeprefix[$:/]addprefix[_system/]] -[tag[Template]tag[Meta]tag[Tool]addprefix[_meta/]] -[tag[Image]tag[Attachment]addprefix[media/]] -[tag[Journal]addprefix[journal/]] -[tag[Source]addprefix[source/]] -[tag[Sink]addprefix[sink/]] -[tag[PAO]addprefix[pao/]] -[tag[Place]addprefix[place/]] -[tag[Publication]tag[Class]addprefix[metasource/]] \ No newline at end of file