[PATCH modular 5/7] build.sh: complete error path when extracting from tars

Gaetan Nadon memsize at videotron.ca
Fri Oct 18 15:44:58 CEST 2013


The return code was not checked and the script aborts if the tar command
fails rather processing the errors in the usual manner.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 build.sh |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/build.sh b/build.sh
index 538aeba..1de9c7b 100755
--- a/build.sh
+++ b/build.sh
@@ -398,13 +398,16 @@ process() {
 	needs_config=1
     else
         checkfortars $module $component
-        CONFCMD="configure"
-    fi
-
-    if [ X"$SRCDIR" = X ]; then
-        echo "$module${component:+/}$component does not exist, skipping."
-        nonexistent_components="$nonexistent_components $module${component:+/}$component"
-        return 0
+        if [ $? -eq 0 ]; then
+	    if [ X"$SRCDIR" = X ]; then
+	        echo "$module${component:+/}$component does not exist, skipping."
+	        nonexistent_components="$nonexistent_components $module${component:+/}$component"
+	        return 0
+	    fi
+	    CONFCMD="configure"
+        else
+	    return 1
+	fi
     fi
 
     old_pwd=`pwd`
-- 
1.7.9.5



More information about the xorg-devel mailing list