From f5d02d97bc8378c022ff7f50558c9f266d46edb7 Mon Sep 17 00:00:00 2001
From: CS <craig@schobox.com>
Date: Wed, 4 Sep 2024 12:06:14 -0400
Subject: [PATCH 1/3] Allow custom smileys to persist in container setups - mv
 original images dir to .core like plugins, etc. - adjust loop to include
 images dir for symlink to /storage

---
 root/build-setup.sh           | 2 ++
 root/dokuwiki-storagesetup.sh | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/root/build-setup.sh b/root/build-setup.sh
index 0519ef6..3d1116c 100755
--- a/root/build-setup.sh
+++ b/root/build-setup.sh
@@ -35,6 +35,8 @@ mv /var/www/html/lib/plugins /var/www/html/lib/plugins.core
 ln -s /storage/lib/plugins /var/www/html/lib/plugins
 mv /var/www/html/lib/tpl /var/www/html/lib/tpl.core
 ln -s /storage/lib/tpl /var/www/html/lib/tpl
+mv /var/www/html/lib/images /var/www/html/lib/images.core
+ln -s /storage/lib/images /var/www/html/lib/images
 
 # delete all build files
 rm -- /build-*
diff --git a/root/dokuwiki-storagesetup.sh b/root/dokuwiki-storagesetup.sh
index 8d3cb6f..c496499 100755
--- a/root/dokuwiki-storagesetup.sh
+++ b/root/dokuwiki-storagesetup.sh
@@ -16,7 +16,7 @@ mkdir -p /storage/conf
 ln -s /var/www/html/conf.core/license.php /storage/conf/license.php
 
 # core extensions are symlinked to the volume
-for ext in plugins tpl; do
+for ext in plugins tpl images; do
   mkdir -p /storage/lib/$ext
   for dir in /var/www/html/lib/$ext.core/*; do
     base=$(basename $dir)

From 108df27b90b70d8ee8df48360f127a8dd57d9c48 Mon Sep 17 00:00:00 2001
From: CS <craig@schobox.com>
Date: Wed, 4 Sep 2024 12:47:42 -0400
Subject: [PATCH 2/3] v2 with additional loop using smileys subdir

---
 root/build-setup.sh           |  4 ++--
 root/dokuwiki-storagesetup.sh | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/root/build-setup.sh b/root/build-setup.sh
index 3d1116c..adb93f6 100755
--- a/root/build-setup.sh
+++ b/root/build-setup.sh
@@ -35,8 +35,8 @@ mv /var/www/html/lib/plugins /var/www/html/lib/plugins.core
 ln -s /storage/lib/plugins /var/www/html/lib/plugins
 mv /var/www/html/lib/tpl /var/www/html/lib/tpl.core
 ln -s /storage/lib/tpl /var/www/html/lib/tpl
-mv /var/www/html/lib/images /var/www/html/lib/images.core
-ln -s /storage/lib/images /var/www/html/lib/images
+mv /var/www/html/lib/images/smileys /var/www/html/lib/images/smileys.core
+ln -s /storage/lib/images/smileys /var/www/html/lib/images/smileys
 
 # delete all build files
 rm -- /build-*
diff --git a/root/dokuwiki-storagesetup.sh b/root/dokuwiki-storagesetup.sh
index c496499..4ab5cdd 100755
--- a/root/dokuwiki-storagesetup.sh
+++ b/root/dokuwiki-storagesetup.sh
@@ -16,7 +16,7 @@ mkdir -p /storage/conf
 ln -s /var/www/html/conf.core/license.php /storage/conf/license.php
 
 # core extensions are symlinked to the volume
-for ext in plugins tpl images; do
+for ext in plugins tpl; do
   mkdir -p /storage/lib/$ext
   for dir in /var/www/html/lib/$ext.core/*; do
     base=$(basename $dir)
@@ -27,3 +27,16 @@ for ext in plugins tpl images; do
   done
 done
 
+# smileys are symlinked to volume so they work per dokuwiki docs
+for ext in smileys; do
+  mkdir -p /storage/lib/images/$ext
+  for dir in /var/www/html/lib/images/$ext.core/*; do
+    base=$(basename $dir)
+    [ -d "/storage/lib/images/$ext/$base" ] && rm -r /storage/lib/images/$ext/$base
+    [ -f "/storage/lib/images/$ext/$base" ] && rm /storage/lib/images/$ext/$base
+    [ -L "/storage/lib/images/$ext/$base" ] && rm /storage/lib/images/$ext/$base
+    ln -s $dir /storage/lib/images/$ext/$base
+  done
+done
+
+

From 8d51db732e12365b27191e1387eb9c4aa266a522 Mon Sep 17 00:00:00 2001
From: CS <craig@schobox.com>
Date: Wed, 4 Sep 2024 12:48:21 -0400
Subject: [PATCH 3/3] v3 that reuses existing loop

---
 root/dokuwiki-storagesetup.sh | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/root/dokuwiki-storagesetup.sh b/root/dokuwiki-storagesetup.sh
index 4ab5cdd..20ea837 100755
--- a/root/dokuwiki-storagesetup.sh
+++ b/root/dokuwiki-storagesetup.sh
@@ -16,7 +16,7 @@ mkdir -p /storage/conf
 ln -s /var/www/html/conf.core/license.php /storage/conf/license.php
 
 # core extensions are symlinked to the volume
-for ext in plugins tpl; do
+for ext in plugins tpl "images/smileys"; do
   mkdir -p /storage/lib/$ext
   for dir in /var/www/html/lib/$ext.core/*; do
     base=$(basename $dir)
@@ -26,17 +26,3 @@ for ext in plugins tpl; do
     ln -s $dir /storage/lib/$ext/$base
   done
 done
-
-# smileys are symlinked to volume so they work per dokuwiki docs
-for ext in smileys; do
-  mkdir -p /storage/lib/images/$ext
-  for dir in /var/www/html/lib/images/$ext.core/*; do
-    base=$(basename $dir)
-    [ -d "/storage/lib/images/$ext/$base" ] && rm -r /storage/lib/images/$ext/$base
-    [ -f "/storage/lib/images/$ext/$base" ] && rm /storage/lib/images/$ext/$base
-    [ -L "/storage/lib/images/$ext/$base" ] && rm /storage/lib/images/$ext/$base
-    ln -s $dir /storage/lib/images/$ext/$base
-  done
-done
-
-