From 3d1ec682a0b7c7c84c9504c0305dab15b46095be Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Fri, 26 Aug 2022 12:34:16 -0400
Subject: [PATCH] add changes from PR #443

---
 .../s6-rc.d/init-mod-universal-cron-setup/run | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-cron-setup/run b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-cron-setup/run
index e09dfc3..63391a2 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-cron-setup/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-cron-setup/run
@@ -5,28 +5,30 @@ mkdir -p \
     /config/crontabs
 
 # if root crontabs do not exist in config
-# copy root crontab from system
-if [[ ! -f /config/crontabs/root ]] && \
-crontab -l -u root; then
-    crontab -l -u root > /config/crontabs/root
+if [[ ! -f /config/crontabs/root ]]; then
+    # copy root crontab from system
+    if crontab -l -u root; then
+        crontab -l -u root > /config/crontabs/root
+    fi
+    
+    # if root crontabs still do not exist in config (were not copied from system)
+    # copy root crontab from included defaults (using -n, do not overwrite an existing file)
+    cp -n /defaults/crontabs-mod/root /config/crontabs/
 fi
 
-# if root crontabs still do not exist in config (were not copied from system)
-# copy root crontab from included defaults
-[[ ! -f /config/crontabs/root ]] && \
-    cp /defaults/crontabs-mod/root /config/crontabs/
 
 # if abc crontabs do not exist in config
-# copy abc crontab from system
-if [[ ! -f /config/crontabs/abc ]] && \
-crontab -l -u abc; then
-    crontab -l -u abc > /config/crontabs/abc
+if [[ ! -f /config/crontabs/abc ]]; then
+    # copy abc crontab from system
+    if crontab -l -u abc; then
+        crontab -l -u abc > /config/crontabs/abc
+    fi
+
+    # if abc crontabs still do not exist in config (were not copied from system)
+    # copy abc crontab from included defaults
+    cp -n /defaults/crontabs-mod/abc /config/crontabs/
 fi
 
-# if abc crontabs still do not exist in config (were not copied from system)
-# copy abc crontab from included defaults
-[[ ! -f /config/crontabs/abc ]] && \
-    cp /defaults/crontabs-mod/abc /config/crontabs/
 
 # import user crontabs
 crontab -u root /config/crontabs/root