OcttKB Cross-Repo Sync (HTML to Raw)

2023-04-13 13:48:38 +00:00 · 2023-04-13 13:48:38 +00:00 · fecf97de73
parent b75b21427c
commit fecf97de73
23 changed files with 92 additions and 50 deletions
--- a/Wiki-OcttKB/tiddlers/System/$__HistoryList.json.meta
+++ b/Wiki-OcttKB/tiddlers/System/$__HistoryList.json.meta
@ -1,5 +1,5 @@
-created: 20230413094038640
+created: 20230413134837771
 current-tiddler: GettingStarted
-modified: 20230413094038640
+modified: 20230413134837771
 title: $:/HistoryList
 type: application/json
--- a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Config_AiLinks.ui.tid
+++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Config_AiLinks.ui.tid
@ -1,7 +1,7 @@
 Enabled: 1
 created: 20230413083119554
 creator: Octt
-modified: 20230413093847513
+modified: 20230413124203473
 modifier: Octt
 tags: $:/GlobalOption
 title: $:/OcttKB/Config/AiLinks.ui
--- a/Wiki-OcttKB/tiddlers/System/$__OcttKB_GlobalOptions.ui.tid
+++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_GlobalOptions.ui.tid
@ -1,7 +1,7 @@
 created: 20230413080548417
 creator: Octt
 list-before: $:/core/ui/SideBarSegments/search
-modified: 20230413093838715
+modified: 20230413124924940
 modifier: Octt
 tags: $:/tags/SideBarSegment
 title: $:/OcttKB/GlobalOptions.ui
@ -15,6 +15,12 @@ title: $:/OcttKB/GlobalOptions.ui
    </$set>
  </$set>)
 </summary>
+<style>
+  label {
+    display: inline-block;
+    width: 100%;
+  }
+</style>
 {{$:/OcttKB/Config/LargeSidebar.ui}}
 <br/><br/>
 {{$:/OcttKB/Config/AiLinks.ui}}
--- a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Build.sh.txt
+++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Build.sh.txt
@ -1,12 +0,0 @@
-#!/bin/sh
-cd ./public
-
-# Build single-page no-JS wiki
-tiddlywiki \
-	--load index.html \
-	--output ./ \
-	--rendertiddler $:/core/templates/static.template.css Style.css text/plain \
-	--rendertiddler $:/core/templates/alltiddlers.template.html Static.html text/plain
-
-# Apply patches to the static HTML
-python3 ../PatchStatic.py
--- a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Build.sh.txt.meta
+++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Build.sh.txt.meta
@ -1,6 +0,0 @@
-created: 20230126082147025
-creator: Octt
-modified: 20230307221654772
-modifier: Octt
-title: $:/OcttKB/Repo/Build.sh
-type: text/plain
--- a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_DeployOld.sh.txt
+++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_DeployOld.sh.txt
@ -1,5 +0,0 @@
-#!/bin/sh
-URL="https://kb.octt.eu.org"
-cd ./public
-wget -O "./-1.html" "$URL" || true
-wget -O "./-2.html" "$URL/-1.html" || true
--- a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_DeployOld.sh.txt.meta
+++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_DeployOld.sh.txt.meta
@ -1,6 +0,0 @@
-created: 20230126082330667
-creator: Octt
-modified: 20230126082445095
-modifier: Octt
-title: $:/OcttKB/Repo/DeployOld.sh
-type: text/plain
--- a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Lib.Git.sh.txt
+++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Lib.Git.sh.txt
@ -0,0 +1,24 @@
+#!/bin/sh
+
+ToLower(){
+  echo "$1" | tr "[:upper:]" "[:lower:]"
+}
+
+SetupGitProfile(){
+  git config --global user.email "$GitUserEmail"
+  git config --global user.name "$GitUserName"
+  git config --global credential.helper store
+  echo "https://$GitUserName:$GitPassword@gitlab.com" > ~/.git-credentials
+}
+
+TryCrossRepoSync(){
+  CommitCheck="$(git log -1 --pretty=%B | ToLower)"
+  CommitMsg0="$("OcttKB Cross-Repo Sync" | ToLower)"
+  [ "$CommitCheck" != "$CommitMsg0 (html to raw)" ] && \
+  [ "$CommitCheck" != "$CommitMsg0 (raw to html)" ] && \
+  [ "$CommitCheck" != "$CommitMsg0 (htm to raw)" ] && \
+  [ "$CommitCheck" != "$CommitMsg0 (raw to htm)" ] && \
+  [ "$CommitCheck" != "$CommitMsg0 (web to raw)" ] && \
+  [ "$CommitCheck" != "$CommitMsg0 (raw to web)" ] && \
+    sh ./GitLab.CrossRepoSync.sh || true
+}
--- a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Lib.Git.sh.txt.meta
+++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Lib.Git.sh.txt.meta
@ -0,0 +1,6 @@
+created: 20230413125137469
+creator: Octt
+modified: 20230413134713676
+modifier: Octt
+title: $:/OcttKB/Repo/Lib.Git.sh
+type: text/plain
--- a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Main.sh.txt
+++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Main.sh.txt
@ -1,3 +1,4 @@
 #!/bin/sh
-sh ./Build.sh
-sh ./DeployOld.sh || true
+. ./Lib.*.sh
+sh ./Pages.BuildStatic.sh
+sh ./Pages.DeployOld.sh
--- a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Main.sh.txt.meta
+++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Main.sh.txt.meta
@ -1,6 +1,6 @@
 created: 20230126081754717
 creator: Octt
-modified: 20230228095521738
+modified: 20230413134700295
 modifier: Octt
 tags: 
 title: $:/OcttKB/Repo/Main.sh
--- a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Pages.BuildStatic.sh.txt
+++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Pages.BuildStatic.sh.txt
@ -0,0 +1,12 @@
+#!/bin/sh
+cd ./public
+
+# Build single-page no-JS wiki
+tiddlywiki \
+  --load ./index.html \
+  --output ./ \
+  --rendertiddler $:/core/templates/static.template.css Style.css text/plain \
+  --rendertiddler $:/core/templates/alltiddlers.template.html Static.html text/plain
+
+# Apply patches to the static HTML
+python3 ../PatchStatic.py
--- a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Pages.BuildStatic.sh.txt.meta
+++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Pages.BuildStatic.sh.txt.meta
@ -0,0 +1,6 @@
+created: 20230126082147025
+creator: Octt
+modified: 20230413132417618
+modifier: Octt
+title: $:/OcttKB/Repo/Pages.BuildStatic.sh
+type: text/plain
--- a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Pages.DeployOld.sh.txt
+++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Pages.DeployOld.sh.txt
@ -0,0 +1,5 @@
+#!/bin/sh
+URL="https://kb.octt.eu.org"
+cd ./public
+wget -O ./-1.html "$URL" || true
+wget -O ./-2.html "$URL/-1.html" || true
--- a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Pages.DeployOld.sh.txt.meta
+++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_Pages.DeployOld.sh.txt.meta
@ -0,0 +1,6 @@
+created: 20230126082330667
+creator: Octt
+modified: 20230413132501058
+modifier: Octt
+title: $:/OcttKB/Repo/Pages.DeployOld.sh
+type: text/plain
--- a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_SetupGitProfile.sh.txt
+++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_SetupGitProfile.sh.txt
@ -1,5 +1,3 @@
 #!/bin/sh
-git config --global user.email "$GitUserEmail"
-git config --global user.name "$GitUserName"
-git config --global credential.helper store
-echo "https://$GitUserName:$GitPassword@gitlab.com" > ~/.git-credentials
+. ./Lib.Git.sh
+SetupGitProfile
--- a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_SetupGitProfile.sh.txt.meta
+++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_SetupGitProfile.sh.txt.meta
@ -1,6 +1,6 @@
 created: 20230228081951095
 creator: Octt
-modified: 20230228082144682
+modified: 20230413134641576
 modifier: Octt
 tags: 
 title: $:/OcttKB/Repo/SetupGitProfile.sh
--- a/Wiki-OcttKB/tiddlers/System/$__StoryList.tid
+++ b/Wiki-OcttKB/tiddlers/System/$__StoryList.tid
@ -1,6 +1,6 @@
-created: 20230413075905806
+created: 20230413124212673
 creator: Octt
-list: 
-modified: 20230413093628410
+list: $:/OcttKB/Repo
+modified: 20230413134703735
 modifier: Octt
 title: $:/StoryList
--- a/Wiki-OcttKB/tiddlers/System/$__state_sidebar.tid
+++ b/Wiki-OcttKB/tiddlers/System/$__state_sidebar.tid
@ -1,6 +1,6 @@
 created: 20220920174307633
 creator: Octt
-modified: 20230307214152122
+modified: 20230413132635748
 modifier: Octt
 title: $:/state/sidebar

--- a/Wiki-OcttKB/tiddlers/System/$__state_tab_sidebar--595412856.tid
+++ b/Wiki-OcttKB/tiddlers/System/$__state_tab_sidebar--595412856.tid
@ -1,7 +1,7 @@
 created: 20220920092307479
 creator: Octt
-modified: 20230413093903344
+modified: 20230413124520866
 modifier: Octt
 title: $:/state/tab/sidebar--595412856

-OcttKB/Index
+$:/core/ui/SideBar/More
--- a/Wiki-OcttKB/tiddlers/System/$__state_tree_$__OcttKB_Repo_Lib_.tid
+++ b/Wiki-OcttKB/tiddlers/System/$__state_tree_$__OcttKB_Repo_Lib_.tid
@ -0,0 +1,7 @@
+created: 20230413132442513
+creator: Octt
+modified: 20230413134703183
+modifier: Octt
+title: $:/state/tree/$:/OcttKB/Repo/Lib/
+
+show
--- a/Wiki-OcttKB/tiddlers/System/$__status_RequireReloadDueToPluginChange.tid
+++ b/Wiki-OcttKB/tiddlers/System/$__status_RequireReloadDueToPluginChange.tid
@ -1,3 +1,3 @@
 title: $:/status/RequireReloadDueToPluginChange

-yes
+no
--- a/Wiki-OcttKB/tiddlers/System/$__themes_tiddlywiki_vanilla_metrics_sidebarwidth.tid
+++ b/Wiki-OcttKB/tiddlers/System/$__themes_tiddlywiki_vanilla_metrics_sidebarwidth.tid
@ -1,7 +1,7 @@
 created: 20220920114844259
 creator: Octt
-modified: 20230413093851446
+modified: 20230413132638250
 modifier: Octt
 title: $:/themes/tiddlywiki/vanilla/metrics/sidebarwidth

-280px
+50vw