From b5b4a510f21d36ea977482ba60874ff003e3df2e Mon Sep 17 00:00:00 2001 From: aptalca Date: Tue, 29 Jun 2021 11:31:57 -0400 Subject: [PATCH] standardize apt-get, update formatting --- root/etc/cont-init.d/95-apt-get | 5 +++++ root/etc/cont-init.d/95-cron | 11 +++++------ 2 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 root/etc/cont-init.d/95-apt-get diff --git a/root/etc/cont-init.d/95-apt-get b/root/etc/cont-init.d/95-apt-get new file mode 100644 index 0000000..4797eca --- /dev/null +++ b/root/etc/cont-init.d/95-apt-get @@ -0,0 +1,5 @@ +#!/usr/bin/with-contenv bash + +if [ -f /usr/bin/apt ]; then + apt-get update +fi \ No newline at end of file diff --git a/root/etc/cont-init.d/95-cron b/root/etc/cont-init.d/95-cron index a5e7f26..1f18a88 100644 --- a/root/etc/cont-init.d/95-cron +++ b/root/etc/cont-init.d/95-cron @@ -4,38 +4,37 @@ if [ ! -f /usr/sbin/cron ] && \ [ -f /usr/bin/apt ]; then # install cron - apt-get update apt-get install --no-install-recommends -y \ cron fi # make folders mkdir -p \ - /config/crontabs + /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 + 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 [[ ! -f /config/crontabs/root ]] && \ - cp /defaults/crontabs-mod/root /config/crontabs/ + 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 + 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/ + cp /defaults/crontabs-mod/abc /config/crontabs/ # import user crontabs crontab -u root /config/crontabs/root