From 72f538e14beec630b15a40bc5bae1d3e23199f7b Mon Sep 17 00:00:00 2001
From: Salim B <git@salim.space>
Date: Sat, 13 Jan 2024 16:19:56 +0100
Subject: [PATCH 1/2] Fix config migration

The `mv` utility in the container doesn't support the [`-u` flag](https://manpages.debian.org/unstable/coreutils/mv.1.en.html#update) (BusyBox version?). Thus we use the [`-n` flag](https://manpages.debian.org/unstable/coreutils/mv.1.en.html#n) instead, which is supported.
---
 syncthing/root/etc/s6-overlay/s6-rc.d/syncthing/run | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syncthing/root/etc/s6-overlay/s6-rc.d/syncthing/run b/syncthing/root/etc/s6-overlay/s6-rc.d/syncthing/run
index e3ef7865..c524f638 100644
--- 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'

From c907a490ecad886c7a13af7d3e19e216cdd63595 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20P=C3=B6schl?= <Poeschl@users.noreply.github.com>
Date: Sat, 13 Jan 2024 16:27:13 +0100
Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=90=9B=20fix=20migration=20logic=20of?=
 =?UTF-8?q?=20syncting?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 syncthing/CHANGELOG.md | 4 ++++
 syncthing/config.yaml  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/syncthing/CHANGELOG.md b/syncthing/CHANGELOG.md
index b4232bba..eccf6f39 100644
--- 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
index 67bd4a5b..0749868f 100644
--- 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"