From 206eda3ca7b1e7a9cf51d2e630fcf62b45455997 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Fri, 23 Nov 2018 19:26:21 -0800 Subject: sv: touch timefile in run scripts --- sv/Makefile | 2 +- sv/snooze-daily/finish | 2 -- sv/snooze-daily/run | 3 ++- sv/snooze-hourly/finish | 2 -- sv/snooze-hourly/run | 3 ++- sv/snooze-monthly/finish | 2 -- sv/snooze-monthly/run | 3 ++- sv/snooze-weekly/finish | 2 -- sv/snooze-weekly/run | 3 ++- 9 files changed, 9 insertions(+), 13 deletions(-) delete mode 100755 sv/snooze-daily/finish delete mode 100755 sv/snooze-hourly/finish delete mode 100755 sv/snooze-monthly/finish delete mode 100755 sv/snooze-weekly/finish diff --git a/sv/Makefile b/sv/Makefile index d97cc39..e5a9416 100644 --- a/sv/Makefile +++ b/sv/Makefile @@ -5,7 +5,7 @@ SVDIR=$(SYSCONFDIR)/sv install: FRC for f in daily hourly weekly monthly; do \ mkdir -p $(DESTDIR)$(SVDIR)/snooze-$$f; \ - install -m0755 snooze-$$f/run snooze-$$f/finish \ + install -m0755 snooze-$$f/run \ $(DESTDIR)$(SVDIR)/snooze-$$f/; \ done diff --git a/sv/snooze-daily/finish b/sv/snooze-daily/finish deleted file mode 100755 index a080f71..0000000 --- a/sv/snooze-daily/finish +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec touch /var/cache/snooze/daily diff --git a/sv/snooze-daily/run b/sv/snooze-daily/run index 1e6ce55..45b4d07 100755 --- a/sv/snooze-daily/run +++ b/sv/snooze-daily/run @@ -1,3 +1,4 @@ #!/bin/sh mkdir -p /var/cache/snooze -exec snooze -s 1d -t /var/cache/snooze/daily -- run-parts --lsbsysinit /etc/cron.daily +exec snooze -s 1d -t /var/cache/snooze/daily -- sh -c \ + "run-parts --lsbsysinit /etc/cron.daily; : > /var/cache/snooze/daily" diff --git a/sv/snooze-hourly/finish b/sv/snooze-hourly/finish deleted file mode 100755 index 8a364b5..0000000 --- a/sv/snooze-hourly/finish +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec touch /var/cache/snooze/hourly diff --git a/sv/snooze-hourly/run b/sv/snooze-hourly/run index 6dc1f73..d9a3f0b 100755 --- a/sv/snooze-hourly/run +++ b/sv/snooze-hourly/run @@ -1,3 +1,4 @@ #!/bin/sh mkdir -p /var/cache/snooze -exec snooze -H \* -s 1h -t /var/cache/snooze/hourly -- run-parts --lsbsysinit /etc/cron.hourly +exec snooze -H \* -s 1h -t /var/cache/snooze/hourly -- sh -c \ + "run-parts --lsbsysinit /etc/cron.hourly; : > /var/cache/snooze/hourly" diff --git a/sv/snooze-monthly/finish b/sv/snooze-monthly/finish deleted file mode 100755 index 7188324..0000000 --- a/sv/snooze-monthly/finish +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec touch /var/cache/snooze/monthly diff --git a/sv/snooze-monthly/run b/sv/snooze-monthly/run index 2497fb3..f506a79 100755 --- a/sv/snooze-monthly/run +++ b/sv/snooze-monthly/run @@ -1,3 +1,4 @@ #!/bin/sh mkdir -p /var/cache/snooze -exec snooze -d 1 -s 28d -t /var/cache/snooze/monthly -- run-parts --lsbsysinit /etc/cron.monthly +exec snooze -d 1 -s 28d -t /var/cache/snooze/monthly -- sh -c \ + "run-parts --lsbsysinit /etc/cron.monthly; : > /var/cache/snooze/monthly" diff --git a/sv/snooze-weekly/finish b/sv/snooze-weekly/finish deleted file mode 100755 index 8f61339..0000000 --- a/sv/snooze-weekly/finish +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec touch /var/cache/snooze/weekly diff --git a/sv/snooze-weekly/run b/sv/snooze-weekly/run index 3a18e74..a3228c7 100755 --- a/sv/snooze-weekly/run +++ b/sv/snooze-weekly/run @@ -1,3 +1,4 @@ #!/bin/sh mkdir -p /var/cache/snooze -exec snooze -w 0 -s 7d -t /var/cache/snooze/weekly -- run-parts --lsbsysinit /etc/cron.weekly +exec snooze -w 0 -s 7d -t /var/cache/snooze/weekly -- sh -c \ + "run-parts --lsbsysinit /etc/cron.weekly; : > /var/cache/snooze/weekly" -- cgit v1.2.3