From 121baec9946541c80028f55894dcd3dd293599c4 Mon Sep 17 00:00:00 2001 From: Matthew Martin Date: Tue, 25 Jul 2017 20:44:10 -0500 Subject: shutdown: Combine sleeping blocks --- shutdown | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/shutdown b/shutdown index 9d51d54..edb67af 100755 --- a/shutdown +++ b/shutdown @@ -55,22 +55,18 @@ case "$time" in *) abort "invalid time";; esac -if [ "$time" -gt 5 ]; then - echo "$message in $time minutes" | wall - printf "shutdown: sleeping for $time minutes... " - sleep $(((time - 5) * 60)) - printf "\n" - time=5 -fi +for break in 5 0; do + [ "$time" -gt "$break" ] || continue + [ "$break" = 0 ] && touch /etc/nologin -if [ "$time" -gt 0 ]; then echo "$message in $time minutes" | wall - touch /etc/nologin - printf "shutdown: sleeping for $time minutes... " - sleep $((time * 60)) + printf "shutdown: sleeping for $(( time - break )) minutes... " + sleep $(( (time - break) * 60 )) + time="$break" printf "\n" - rm /etc/nologin -fi + + [ "$break" = 0 ] && rm /etc/nologin +done echo "$message NOW" | wall -- cgit 1.4.1