From: Michael Prokop <mika@grml.org>
Date: Thu, 21 Jul 2011 16:12:06 +0000 (+0200)
Subject: zshrc: make sure simple-extract() returns according return code when download of... 
X-Git-Tag: v0.4.00~10
X-Git-Url: http://git.grml.org/?p=grml-etc-core.git;a=commitdiff_plain;h=787c3061ef67a7a4dc9db62dfa38aa34b5763282

zshrc: make sure simple-extract() returns according return code when download of an archive file fails and slightly adjust error messages.
---

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index 9cdb7d2..b56cd09 100644
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -3741,6 +3741,7 @@ selhist() {
 }
 
 # Usage: simple-extract <file>
+# Using option -d deletes the original archive file.
 #f5# Smart archive extractor
 simple-extract() {
     emulate -L zsh
@@ -3818,7 +3819,7 @@ simple-extract() {
         esac
 
         if ! check_com ${DECOMP_CMD[(w)1]}; then
-            echo "ERROR: ${DECOMP_CMD[(w)1]} not installed !" >&2
+            echo "ERROR: ${DECOMP_CMD[(w)1]} not installed." >&2
             RC=$((RC+2))
             continue
         fi
@@ -3856,8 +3857,10 @@ simple-extract() {
             if $USES_STDIN; then
                 if $USES_STDOUT; then
                     ${=WGET_CMD} "$ARCHIVE" | ${=DECOMP_CMD} > $GZTARGET
+                    RC=$((RC+$?))
                 else
                     ${=WGET_CMD} "$ARCHIVE" | ${=DECOMP_CMD}
+                    RC=$((RC+$?))
                 fi
             else
                 if $USES_STDOUT; then
@@ -3868,7 +3871,7 @@ simple-extract() {
             fi
 
         else
-            print "ERROR: '$ARCHIVE' is neither a valid file nor a supported URI" >&2
+            print "ERROR: '$ARCHIVE' is neither a valid file nor a supported URI." >&2
             RC=$((RC+8))
         fi
     done