From 2eee9bdb6a2ab51a8be62da87f9932c789ccfe6d Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Wed, 12 Feb 2020 09:54:54 +0100
Subject: update-me: exit_or_rescue_shell() kann mehr

---
 update-me.in | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/update-me.in b/update-me.in
index cb5ce13..46db7f7 100644
--- a/update-me.in
+++ b/update-me.in
@@ -21,11 +21,16 @@ if command -v check-kernel >/dev/null; then
 fi
 
 exit_or_rescue_shell() {
+  if [ "$1" -eq 0 ]; then
+    >&2 printf '%s: Erfolg\n' "$(hostname)"
+  else
+    >&2 printf '%s: Fehler\n' "$(hostname)"
+  fi
   read s
   if [ -n "${s}" ]; then
     bash
   fi
-  exit $1
+  exit "$1"
 }
 
 . #ETCDIR#/update-me.conf
@@ -80,8 +85,6 @@ do
   err=$?
   if [ ${err} -ne 0 ]
   then
-    >&2 printf '%s: Fehler\n' "$(hostname)"
-    read s
     exit_or_rescue_shell ${err}
   fi
 done
@@ -92,8 +95,6 @@ do
   err=$?
   if [ ${err} -ne 0 ]
   then
-    >&2 printf '%s: Fehler\n' "$(hostname)"
-    read s
     exit_or_rescue_shell ${err}
   fi
 done
@@ -109,12 +110,8 @@ do
   err=$?
   if [ ${err} -ne 0 ]
   then
-    >&2 printf '%s: Fehler\n' "$(hostname)"
-    read s
     exit_or_rescue_shell ${err}
   fi
 done
 
->&2 printf '%s: Erfolg\n' "$(hostname)"
-read s
 exit_or_rescue_shell 0
-- 
cgit v1.2.3-54-g00ecf