Matej Habrnal 0b651c
From a8f12ee8aa40d9ff05004bf6661ab442ad161202 Mon Sep 17 00:00:00 2001
Matej Habrnal 0b651c
From: Jakub Filak <jfilak@redhat.com>
Matej Habrnal 0b651c
Date: Thu, 9 Oct 2014 16:28:12 +0200
Matej Habrnal 0b651c
Subject: [PATCH] console-notifications: use return instead of exit
Matej Habrnal 0b651c
Matej Habrnal 0b651c
Thanks Ray Strode [halfline] <rstrode@redhat.com>
Matej Habrnal 0b651c
Matej Habrnal 0b651c
Related to rhbz#1150169
Matej Habrnal 0b651c
Matej Habrnal 0b651c
Signed-off-by: Jakub Filak <jfilak@redhat.com>
Matej Habrnal 0b651c
---
Matej Habrnal 0b651c
 src/cli/abrt-console-notification.sh | 10 +++++-----
Matej Habrnal 0b651c
 1 file changed, 5 insertions(+), 5 deletions(-)
Matej Habrnal 0b651c
Matej Habrnal 0b651c
diff --git a/src/cli/abrt-console-notification.sh b/src/cli/abrt-console-notification.sh
Matej Habrnal 0b651c
index 849273c..38de7bb 100755
Matej Habrnal 0b651c
--- a/src/cli/abrt-console-notification.sh
Matej Habrnal 0b651c
+++ b/src/cli/abrt-console-notification.sh
Matej Habrnal 0b651c
@@ -1,13 +1,13 @@
Matej Habrnal 0b651c
-# If shell is not connect to a terminal, exit immediately, because this script
Matej Habrnal 0b651c
+# If shell is not connect to a terminal, return immediately, because this script
Matej Habrnal 0b651c
 # should print out ABRT's status and it is senseless to continue without
Matej Habrnal 0b651c
 # terminal.
Matej Habrnal 0b651c
-tty -s || exit 0
Matej Habrnal 0b651c
+tty -s || return 0
Matej Habrnal 0b651c
 
Matej Habrnal 0b651c
 # If $HOME is not set, a non human user is logging in to shell but this script
Matej Habrnal 0b651c
-# should provide information to human users, therefore exiting immediately
Matej Habrnal 0b651c
+# should provide information to human users, therefore returning immediately
Matej Habrnal 0b651c
 # without showing the notification.
Matej Habrnal 0b651c
 if [ -z "$HOME" ]; then
Matej Habrnal 0b651c
-    exit 0
Matej Habrnal 0b651c
+    return 0
Matej Habrnal 0b651c
 fi
Matej Habrnal 0b651c
 
Matej Habrnal 0b651c
 if [ -z "$ABRT_DEBUG_LOG" ]; then
Matej Habrnal 0b651c
@@ -19,7 +19,7 @@ SINCEFILE="$LPATHDIR/lastnotification"
Matej Habrnal 0b651c
 
Matej Habrnal 0b651c
 if [ ! -f "$LPATHDIR" ]; then
Matej Habrnal 0b651c
     # It might happen that user doesn't have write access on his home.
Matej Habrnal 0b651c
-    mkdir -p "$LPATHDIR" >"$ABRT_DEBUG_LOG" 2>&1 || exit 0
Matej Habrnal 0b651c
+    mkdir -p "$LPATHDIR" >"$ABRT_DEBUG_LOG" 2>&1 || return 0
Matej Habrnal 0b651c
 fi
Matej Habrnal 0b651c
 
Matej Habrnal 0b651c
 TMPPATH=`mktemp --tmpdir="$LPATHDIR" lastnotification.XXXXXXXX 2> "$ABRT_DEBUG_LOG"`
Matej Habrnal 0b651c
-- 
Matej Habrnal 0b651c
1.9.3
Matej Habrnal 0b651c