Simplify source copy error handling

openSUSE · Feb 4, 2022 · 7594082 · 7594082
1 parent 03a8b94
commit 7594082
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/build-recipe-docker b/build-recipe-docker
@@ -35,10 +35,7 @@ recipe_setup_docker() {
         if test -z "$LINKSOURCES" ; then 
 	    copy_sources "$MYSRCDIR" "$BUILD_ROOT$TOPDIR/SOURCES/"
         else
-            cp -lR "$MYSRCDIR"/* $BUILD_ROOT$TOPDIR/SOURCES/
-            if test "$?" != 0 ; then
-                cleanup_and_exit 1 "source copy failed"
-            fi
+            cp -lR "$MYSRCDIR"/* $BUILD_ROOT$TOPDIR/SOURCES/ || cleanup_and_exit 1 "source copy failed"
         fi
     fi  
     chown -hR "$ABUILD_UID:$ABUILD_GID" "$BUILD_ROOT$TOPDIR"

diff --git a/build-recipe-helm b/build-recipe-helm
@@ -28,10 +28,7 @@ recipe_setup_helm() {
 	if test -z "$LINKSOURCES" ; then
 	    copy_sources "$MYSRCDIR" "$BUILD_ROOT$TOPDIR/SOURCES/"
 	else
-	    cp -lR "$MYSRCDIR"/* $BUILD_ROOT$TOPDIR/SOURCES/
-            if test "$?" != 0 ; then
-                cleanup_and_exit 1 "source copy failed"
-            fi
+	    cp -lR "$MYSRCDIR"/* $BUILD_ROOT$TOPDIR/SOURCES/ || cleanup_and_exit 1 "source copy failed"
 	fi
     fi
     chown -hR "$ABUILD_UID:$ABUILD_GID" "$BUILD_ROOT$TOPDIR"

diff --git a/build-recipe-kiwi b/build-recipe-kiwi
@@ -316,12 +316,9 @@ recipe_setup_kiwi() {
 	mv "$MYSRCDIR"/* $BUILD_ROOT$TOPDIR/SOURCES/
     else
 	if test -z "$LINKSOURCES" ; then 
-	    cp -dLR "$MYSRCDIR"/* $BUILD_ROOT$TOPDIR/SOURCES/
+	    cp -dLR "$MYSRCDIR"/* $BUILD_ROOT$TOPDIR/SOURCES/ || cleanup_and_exit 1 "source copy failed"
 	else
-	    cp -lR "$MYSRCDIR"/* $BUILD_ROOT$TOPDIR/SOURCES/
-	fi
-	if test "$?" != 0 ; then 
-	    cleanup_and_exit 1 "source copy failed"
+	    cp -lR "$MYSRCDIR"/* $BUILD_ROOT$TOPDIR/SOURCES/ || cleanup_and_exit 1 "source copy failed"
 	fi
     fi
     chown -hR "$ABUILD_UID:$ABUILD_GID" "$BUILD_ROOT$TOPDIR"