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