Merge pull request #454 from Poeschl/dev

Fix Syncthing addon
Poeschl · Jan 13, 2024 · cccb73d · cccb73d
2 parents 253362e + c907a49
commit cccb73d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/syncthing/CHANGELOG.md b/syncthing/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.18.1 - 2024-01-13
+
+* 🐛 Fix migration issue
+
 ## 1.18.0 - 2024-01-13
 
 * 🔨 Configure Syncthing via environment variables instead of CLI arguments where possible and properly separate config and database/state directories (thanks @salim-b | #450)

diff --git a/syncthing/config.yaml b/syncthing/config.yaml
@@ -1,5 +1,5 @@
 name: Syncthing
-version: "1.18.0"
+version: "1.18.1"
 slug: syncthing
 description: "Syncthing is a continuous file synchronization program in a
   de-centralized way"

diff --git a/syncthing/root/etc/s6-overlay/s6-rc.d/syncthing/run b/syncthing/root/etc/s6-overlay/s6-rc.d/syncthing/run
@@ -20,9 +20,9 @@ if [ -d /data/config ]
 then
   for CONF_FILE in config.xml cert.pem key.pem https-cert.pem https-key.pem
   do
-    [ -f "/data/config/${CONF_FILE}" ] && mv -fu "/data/config/${CONF_FILE}" /config/ && rm -f "/data/config/${CONF_FILE}"
+    [ -f "/data/config/${CONF_FILE}" ] && mv -fn "/data/config/${CONF_FILE}" /config/ && rm -f "/data/config/${CONF_FILE}"
   done
-  mv -fu /data/config/* /data/ && rm -f /data/config
+  mv -fn /data/config/* /data/ && rm -f /data/config
 fi
 
 bashio::log.info 'Starting Syncthing'