Merge pull request #595 from linuxserver/universal-cron-formatting

Format shell scripts and set permissions

root/etc/cont-init.d/95-apt-get

@@ -1,5 +1,6 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 if [ -f /usr/bin/apt ]; then
     apt-get update
-fi
+fi

root/etc/cont-init.d/95-cron

@@ -1,8 +1,9 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 # determine if setup is needed for ubuntu
-if [ ! -f /usr/sbin/cron ] && \
-[ -f /usr/bin/apt ]; then
+if [ ! -f /usr/sbin/cron ] &&
+    [ -f /usr/bin/apt ]; then
     # install cron
     apt-get install --no-install-recommends -y \
         cron
@@ -12,30 +13,34 @@ fi
 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
+## root
+# if crontabs do not exist in config
+if [[ ! -f /config/crontabs/root ]]; then
+    # copy crontab from system
+    if crontab -l -u root; then
+        crontab -l -u root >/config/crontabs/root
+    fi
+
+    # if crontabs still do not exist in config (were not copied from system)
+    # copy 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
-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
+# set permissions and import user crontabs
+lsiown root:root /config/crontabs/root
 crontab -u root /config/crontabs/root
+
+## abc
+# if crontabs do not exist in config
+if [[ ! -f /config/crontabs/abc ]]; then
+    # copy crontab from system
+    if crontab -l -u abc; then
+        crontab -l -u abc >/config/crontabs/abc
+    fi
+
+    # if crontabs still do not exist in config (were not copied from system)
+    # copy crontab from included defaults (using -n, do not overwrite an existing file)
+    cp -n /defaults/crontabs-mod/abc /config/crontabs/
+fi
+# set permissions and import user crontabs
+lsiown abc:abc /config/crontabs/abc
 crontab -u abc /config/crontabs/abc

root/etc/s6-overlay/s6-rc.d/init-mod-universal-cron-add-package/run

@@ -1,8 +1,9 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 if [ ! -f /usr/sbin/cron ] && [ -f /usr/bin/apt ]; then
     echo "**** Adding cron to package install list ****"
-    echo "cron" >> /mod-repo-packages-to-install.list
+    echo "cron" >>/mod-repo-packages-to-install.list
 else
     echo "**** cron package already installed, skipping ****"
 fi

root/etc/s6-overlay/s6-rc.d/init-mod-universal-cron-setup/run

@@ -1,35 +1,38 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 # make folders
 mkdir -p \
     /config/crontabs
 
-# if root crontabs do not exist in config
+## root
+# if crontabs do not exist in config
 if [[ ! -f /config/crontabs/root ]]; then
-    # copy root crontab from system
+    # copy crontab from system
     if crontab -l -u root; then
-        crontab -l -u root > /config/crontabs/root
+        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)
+
+    # if crontabs still do not exist in config (were not copied from system)
+    # copy crontab from included defaults (using -n, do not overwrite an existing file)
     cp -n /defaults/crontabs-mod/root /config/crontabs/
 fi
+# set permissions and import user crontabs
+lsiown root:root /config/crontabs/root
+crontab -u root /config/crontabs/root
 
-
-# if abc crontabs do not exist in config
+## abc
+# if crontabs do not exist in config
 if [[ ! -f /config/crontabs/abc ]]; then
-    # copy abc crontab from system
+    # copy crontab from system
     if crontab -l -u abc; then
-        crontab -l -u abc > /config/crontabs/abc
+        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
+    # if crontabs still do not exist in config (were not copied from system)
+    # copy crontab from included defaults (using -n, do not overwrite an existing file)
     cp -n /defaults/crontabs-mod/abc /config/crontabs/
 fi
-
-
-# import user crontabs
-crontab -u root /config/crontabs/root
+# set permissions and import user crontabs
+lsiown abc:abc /config/crontabs/abc
 crontab -u abc /config/crontabs/abc

root/etc/s6-overlay/s6-rc.d/svc-mod-universal-cron/run

@@ -1,4 +1,5 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 if [ -f /usr/bin/apt ]; then
     # ubuntu

root/etc/services.d/cron/run

@@ -1,10 +1,10 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 if [ -f /usr/bin/apt ]; then
     # ubuntu
     exec /usr/sbin/cron -f -L 1
-fi
-if [ -f /sbin/apk ]; then
+elif [ -f /sbin/apk ]; then
     # alpine
     exec /usr/sbin/crond -f -S -l 5
 fi