From 926690d3371ca15ca916cc6d4e0b29b2264cfe31 Mon Sep 17 00:00:00 2001
From: GitHub Workflow <workflow@github.com>
Date: Fri, 31 Jan 2025 18:42:40 +0000
Subject: [PATCH] Runs update.sh

---
 2025.02-dev/apache/entrypoint-dev.sh     | 6 ++++--
 2025.02-dev/fpm-alpine/entrypoint-dev.sh | 6 ++++--
 2025.02-dev/fpm/entrypoint-dev.sh        | 6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/2025.02-dev/apache/entrypoint-dev.sh b/2025.02-dev/apache/entrypoint-dev.sh
index 8b34c21..fb56fee 100755
--- a/2025.02-dev/apache/entrypoint-dev.sh
+++ b/2025.02-dev/apache/entrypoint-dev.sh
@@ -15,8 +15,8 @@ if (expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]) && [ "${FRIENDICA_
 
     echo "Download sources for ${FRIENDICA_VERSION} (Addon: ${FRIENDICA_ADDONS})"
 
-    # Removing the whole directory first
-    rm -fr /usr/src/friendica
+    # Removing the previous sources (except config) first
+    find /usr/src/friendica -mindepth 1 -maxdepth 1 ! -name 'config' -exec rm -rf {} +
     export GNUPGHOME="$(mktemp -d)"
 
     gpg --batch --logger-fd=1 --no-tty --quiet --keyserver keyserver.ubuntu.com --recv-keys 08656443618E6567A39524083EE197EF3F9E4287
@@ -28,6 +28,8 @@ if (expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]) && [ "${FRIENDICA_
 
     tar -xzf friendica-full-${FRIENDICA_VERSION}.tar.gz -C /usr/src/
     rm friendica-full-${FRIENDICA_VERSION}.tar.gz friendica-full-${FRIENDICA_VERSION}.tar.gz.asc
+    cp -an /usr/src/friendica/config/* /usr/src/friendica-full-${FRIENDICA_VERSION}/config/    
+    rm -fr /usr/src/friendica
     mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica
     echo "Core sources (${FRIENDICA_VERSION}) extracted"
 
diff --git a/2025.02-dev/fpm-alpine/entrypoint-dev.sh b/2025.02-dev/fpm-alpine/entrypoint-dev.sh
index 8b34c21..fb56fee 100755
--- a/2025.02-dev/fpm-alpine/entrypoint-dev.sh
+++ b/2025.02-dev/fpm-alpine/entrypoint-dev.sh
@@ -15,8 +15,8 @@ if (expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]) && [ "${FRIENDICA_
 
     echo "Download sources for ${FRIENDICA_VERSION} (Addon: ${FRIENDICA_ADDONS})"
 
-    # Removing the whole directory first
-    rm -fr /usr/src/friendica
+    # Removing the previous sources (except config) first
+    find /usr/src/friendica -mindepth 1 -maxdepth 1 ! -name 'config' -exec rm -rf {} +
     export GNUPGHOME="$(mktemp -d)"
 
     gpg --batch --logger-fd=1 --no-tty --quiet --keyserver keyserver.ubuntu.com --recv-keys 08656443618E6567A39524083EE197EF3F9E4287
@@ -28,6 +28,8 @@ if (expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]) && [ "${FRIENDICA_
 
     tar -xzf friendica-full-${FRIENDICA_VERSION}.tar.gz -C /usr/src/
     rm friendica-full-${FRIENDICA_VERSION}.tar.gz friendica-full-${FRIENDICA_VERSION}.tar.gz.asc
+    cp -an /usr/src/friendica/config/* /usr/src/friendica-full-${FRIENDICA_VERSION}/config/    
+    rm -fr /usr/src/friendica
     mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica
     echo "Core sources (${FRIENDICA_VERSION}) extracted"
 
diff --git a/2025.02-dev/fpm/entrypoint-dev.sh b/2025.02-dev/fpm/entrypoint-dev.sh
index 8b34c21..fb56fee 100755
--- a/2025.02-dev/fpm/entrypoint-dev.sh
+++ b/2025.02-dev/fpm/entrypoint-dev.sh
@@ -15,8 +15,8 @@ if (expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]) && [ "${FRIENDICA_
 
     echo "Download sources for ${FRIENDICA_VERSION} (Addon: ${FRIENDICA_ADDONS})"
 
-    # Removing the whole directory first
-    rm -fr /usr/src/friendica
+    # Removing the previous sources (except config) first
+    find /usr/src/friendica -mindepth 1 -maxdepth 1 ! -name 'config' -exec rm -rf {} +
     export GNUPGHOME="$(mktemp -d)"
 
     gpg --batch --logger-fd=1 --no-tty --quiet --keyserver keyserver.ubuntu.com --recv-keys 08656443618E6567A39524083EE197EF3F9E4287
@@ -28,6 +28,8 @@ if (expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]) && [ "${FRIENDICA_
 
     tar -xzf friendica-full-${FRIENDICA_VERSION}.tar.gz -C /usr/src/
     rm friendica-full-${FRIENDICA_VERSION}.tar.gz friendica-full-${FRIENDICA_VERSION}.tar.gz.asc
+    cp -an /usr/src/friendica/config/* /usr/src/friendica-full-${FRIENDICA_VERSION}/config/    
+    rm -fr /usr/src/friendica
     mv -f /usr/src/friendica-full-${FRIENDICA_VERSION}/ /usr/src/friendica
     echo "Core sources (${FRIENDICA_VERSION}) extracted"