From 6cb76e325bdf16c67995fa4a354c2facd850d662 Mon Sep 17 00:00:00 2001
From: octospacc <octo@tutamail.com>
Date: Tue, 11 Jul 2023 01:01:37 +0200
Subject: [PATCH] Manual push Tue Jul 11 01:01:36 AM CEST 2023

---
 ...$__OcttKB_Repo_GitLab.CrossRepoSync.sh.txt | 36 ++++++++++++++++---
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_GitLab.CrossRepoSync.sh.txt b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_GitLab.CrossRepoSync.sh.txt
index 870a786..9ee3b2d 100644
--- a/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_GitLab.CrossRepoSync.sh.txt
+++ b/Wiki-OcttKB/tiddlers/System/$__OcttKB_Repo_GitLab.CrossRepoSync.sh.txt
@@ -17,9 +17,35 @@ tiddlywiki \
 	--savewikifolder "./Wiki-$TargetWiki"
 
 cd "./Wiki-$TargetWiki/tiddlers"
-mkdir -vp ../Normal ../System
-mv \$__* ../System/ || true
-mv * ../Normal/ || true
-mv ../System ../Normal ./
-cd ../..
+
+for Dir in Normal System
+do mkdir -vp "../${Dir}" "../${Dir}.tmp"
+done
+
+mv \$__* ../System.tmp/ || true
+mv *     ../Normal.tmp/ || true
+#mv .*    ../Normal.tmp/ || true
+cd ..
+
+for TypeDir in System Normal
+do
+	cd "./${TypeDir}.tmp"
+	for OldFile in *
+	do
+		#WorkDir="$PWD"
+		NewFile="$(echo "${OldFile}" | sed -e 's|_|/|g')"
+		BaseName="$(echo "${NewFile}" | rev | cut -d"/" -f1 | rev)"
+		mkdir -p "../${TypeDir}/${NewFile}"
+		rm -rf "../${TypeDir}/${NewFile}"
+		mv "./${OldFile}" "../${TypeDir}/${NewFile}"
+		#cd "../${TypeDir}"
+		#mv "./$NewPath" "./$BaseName"
+		#cd "$WorkDir"
+	done
+	cd ..
+done
+
+mv ./System ./Normal ./tiddlers
+rm -rf ./System.tmp ./Normal.tmp
+cd ..
 GitPush "OcttKB Cross-Repo Sync (HTML to Raw)"