From 337673aab0d889144ee2c7e20ee96efc0218d4a9 Mon Sep 17 00:00:00 2001 From: Nicolas Boisselier Date: Mon, 1 May 2023 21:32:12 +0200 Subject: [PATCH] Uninstall when /etc/nb/cron.no exists --- bin/nb-install | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/bin/nb-install b/bin/nb-install index 2660b6aa..724e9a8f 100755 --- a/bin/nb-install +++ b/bin/nb-install @@ -49,10 +49,23 @@ main() { # if ! which crontab > /dev/null; then [ 1 = 1 ] + elif [ -e /etc/nb/cron.no ]; then - rm -f /etc/cron.d/nb /var/log/nb.log + + if [ -e /etc/cron.d/nb ]; then + rm -f /etc/cron.d/nb + echo cron_clean >> /etc/nb/cron.no + fi + + # We want to do it only once + if ! grep -q cron_clean /etc/nb/cron.no 2>/dev/null; then + cron_d_install "" "nb-update|$NB_ROOT|NB_ROOT|NB_LOG" + echo cron_clean >> /etc/nb/cron.no + fi + else cron_d_install "$NB_ROOT/etc/cron/nb" "nb-update|$NB_ROOT|NB_ROOT|NB_LOG" && verbose "Cron: $NB_ROOT/etc/cron/nb" + fi ############################################################################## @@ -90,8 +103,8 @@ main() { # # Log # - NB_USER=`(ls -dl $NB_ROOT 2>/dev/null || printf '- 0 root') | awk '{print $3}'` - verbose $(chown "$NB_USER" /var/log/nb.log 2> /dev/null) + # NB 01.05.23 NB_USER=`(ls -dl $NB_ROOT 2>/dev/null || printf '- 0 root') | awk '{print $3}'` + # NB 01.05.23 verbose $(chown "$NB_USER" /var/log/nb.log 2> /dev/null) ############################################################################## # -- 2.47.3