From 3bf0141d26099e6450f7a7ff7527986ecbdfa48c Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Wed, 19 Apr 2023 18:47:58 +0100
Subject: [PATCH] Fix content symlinks

---
 root/defaults/config.default.js               |  3 +--
 .../s6-overlay/s6-rc.d/init-raneto-config/run | 25 +++++++++++--------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/root/defaults/config.default.js b/root/defaults/config.default.js
index 98c11d1..272e579 100644
--- a/root/defaults/config.default.js
+++ b/root/defaults/config.default.js
@@ -68,7 +68,7 @@ var config = {
   content_dir : '/config/content/',
 
   // Where is the public directory or document root?
-  public_dir  : '/app/raneto/themes/default/public',
+  public_dir: path.join(theme_dir, theme_name, 'public'),
 
   // The base URL of your images folder,
   // Relative to config.public_dir
@@ -165,7 +165,6 @@ var config = {
   menu_on_pages: true,
   menu_on_page_collapsible: true,
 };
-config.public_dir = '/app/raneto/themes/default/public';
 
 // Exports
 module.exports = config;
diff --git a/root/etc/s6-overlay/s6-rc.d/init-raneto-config/run b/root/etc/s6-overlay/s6-rc.d/init-raneto-config/run
index 69de2d0..2a1f0ef 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-raneto-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-raneto-config/run
@@ -1,19 +1,22 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash
 
-# make directories if necessary
-mkdir -p /config/content
+folders=(
+    /app/raneto/node_modules/@raneto/theme-default/dist/public/images
+    /app/raneto/content
+)
 
-i=/app/raneto/themes/default/public/images
-if [[ -e "$i" && ! -L "$i" && -e /config/"$(basename "$i")" ]]; then
-    rm -Rf "$i" && \
-    ln -s /config/"$(basename "$i")" "$i"
-fi
+for i in "${folders[@]}"; do
+    if [[ -e "$i" && ! -L "$i" && -e /config/"$(basename "$i")" ]]; then
+        rm -Rf "$i" && \
+        ln -s /config/"$(basename "$i")" "$i"
+    fi
 
-if [[ -e "$i" && ! -L "$i" ]]; then
-    mv "$i" /config/"$(basename "$i")" && \
-    ln -s /config/"$(basename "$i")" "$i"
-fi
+    if [[ -e "$i" && ! -L "$i" ]]; then
+        mv "$i" /config/"$(basename "$i")" && \
+        ln -s /config/"$(basename "$i")" "$i"
+    fi
+done
 
 # create local user server files
 if [[ ! -f /config/config.default.js ]]; then