From 377ad0e89b7438b26fb435d83d1d86d4569de670 Mon Sep 17 00:00:00 2001
From: Alex Palaistras <alex@deuill.org>
Date: Sun, 12 Sep 2021 22:20:04 +0100
Subject: [PATCH] hooks/post-merge: Don't delete .env files

These are required for active services, and can cause issues if deleted
in certain cases.
---
 hooks/post-merge | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/hooks/post-merge b/hooks/post-merge
index d61a26d..a760cf4 100755
--- a/hooks/post-merge
+++ b/hooks/post-merge
@@ -27,6 +27,11 @@ function sync-coreos-config() {
 
         # Remove files that only exist in local configuration.
         for f in $(comm -23 <(cd "$path"; find . | sort) <(cd "$dir"; find . | sort)); do
+            # Don't delete environment files, as these are required for active services.
+            if test "$(basename --suffix=.env "$f")" != "$(basename "$f")"; then
+                continue
+            fi
+
             rm --verbose --recursive --force "$(realpath --quiet "$path/$f")"
         done