Fix icon generation and add DB backup

SynoCommunity · Mar 16, 2023 · 1b0cb80 · 1b0cb80
1 parent 946566a
commit 1b0cb80
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/mk/spksrc.icon.mk b/mk/spksrc.icon.mk
@@ -14,7 +14,7 @@ ICON_COOKIE = $(WORK_DIR)/.$(COOKIE_PREFIX)icon_done
 # Icons are only needed with "DSM UI configuration" (see spksrc.service.mk)
 ifneq ($(strip $(DSM_UI_DIR)),)
 ifneq ($(strip $(SPK_ICON)),)
-ifneq ($(strip $(SERVICE_PORT)),)
+ifneq ($(or $(strip $(SERVICE_PORT)), $(strip $(ADMIN_URL))),)
 ifeq ($(strip $(NO_SERVICE_SHORTCUT)),)
 ICON_DIR = $(STAGING_DIR)/$(DSM_UI_DIR)/images
 endif

diff --git a/spk/owncloud/src/service-setup.sh b/spk/owncloud/src/service-setup.sh
@@ -213,6 +213,12 @@ service_preupgrade ()
     ${MKDIR} ${SYNOPKG_TEMP_UPGRADE_FOLDER}/${SYNOPKG_PKGNAME}
     rsync -aX ${OCROOT}/ ${SYNOPKG_TEMP_UPGRADE_FOLDER}/${SYNOPKG_PKGNAME} 2>&1
 
+    # Backup server database
+    [ -d ${SYNOPKG_TEMP_UPGRADE_FOLDER}/db_backup ] && ${RM} ${SYNOPKG_TEMP_UPGRADE_FOLDER}/db_backup
+    echo "Backup existing server database to ${SYNOPKG_TEMP_UPGRADE_FOLDER}/db_backup"
+    ${MKDIR} ${SYNOPKG_TEMP_UPGRADE_FOLDER}/db_backup
+    ${SQLITE} "${DATADIR}/${SYNOPKG_PKGNAME}.db" ".backup '${SYNOPKG_TEMP_UPGRADE_FOLDER}/db_backup/${SYNOPKG_PKGNAME}-dbbackup_$(date +"%Y%m%d").bak'" 2>&1
+
     exit 0
 }
 
@@ -228,6 +234,25 @@ service_restore ()
         ${RM} ${SYNOPKG_TEMP_UPGRADE_FOLDER}/.datadirectory
     fi
 
+    # Archive backup server database
+    echo "Archive backup server database to ${OCROOT}/data"
+    if [ -d ${SYNOPKG_TEMP_UPGRADE_FOLDER}/db_backup ]; then
+        if [ -d ${OCROOT}/data/db_backup ]; then
+            i=1
+            while [ -d "${OCROOT}/data/db_backup.${i}" ]
+            do
+                i=$((i+1))
+            done
+            while [ $i -gt 1 ]; do
+                j=$((i-1))
+                ${MV} "${OCROOT}/data/db_backup.${j}" "${OCROOT}/data/db_backup.${i}"
+                i=$j
+            done
+            ${MV} "${OCROOT}/data/db_backup" "${OCROOT}/data/db_backup.1"
+        fi
+        rsync -aX ${SYNOPKG_TEMP_UPGRADE_FOLDER}/db_backup ${OCROOT}/data/ 2>&1
+    fi
+
     # Restore the configuration files
     echo "Restoring previous configuration from ${SYNOPKG_TEMP_UPGRADE_FOLDER}/${SYNOPKG_PKGNAME}"
     source="${SYNOPKG_TEMP_UPGRADE_FOLDER}/${SYNOPKG_PKGNAME}/config"