Ticket #5256: build_haiku_imageExitOnUnzipFailureParanoid.patch

build/scripts/build_haiku_image

@@ -79 +79 @@
     echo "Unzipping $zipFile ..."
 
     unzipDir=$tmpDir/unzip
-    $rmAttrs -rf "$unzipDir"
-    mkdir -p "$unzipDir"
+    $rmAttrs -rf "$unzipDir" || exit 1
+    mkdir -p "$unzipDir" || exit 1
 
     $unzip -q -d "$unzipDir" "$zipFile"
 
@@ -90 +90 @@
         rm $unzipDir/.OptionalPackageDescription
     fi
 
-    $cp -r "${sPrefix}$unzipDir/." "${tPrefix}$targetUnzipDir"
+    $cp -r "${sPrefix}$unzipDir/." "${tPrefix}$targetUnzipDir" || exit 1
 
-    $rmAttrs -rf "$unzipDir"
+    $rmAttrs -rf "$unzipDir" || exit 1
 }
 
 
-mkdir -p $tmpDir
+mkdir -p $tmpDir || exit 1
 copyrightsFile=$tmpDir/copyrights
-$rmAttrs -f $copyrightsFile
+$rmAttrs -f $copyrightsFile || exit 1
 if [ "$optionalPackageDescriptions" ]; then
-    cp "$optionalPackageDescriptions" $copyrightsFile
+    cp "$optionalPackageDescriptions" $copyrightsFile || exit 1
 fi
 
 
@@ -129 +129 @@
 
         $bfsShell --initialize $imageOffsetFlags "$imagePath" \
             "$imageLabel" "block_size 2048" || exit 1
-        $makebootable $imageOffsetFlags "$imagePath"
+        $makebootable $imageOffsetFlags "$imagePath" || exit 1
     fi
     $bfsShell -n $imageOffsetFlags "$imagePath" > /dev/null &
     sleep 1
@@ -153 +153 @@
 
     echo "Deleting old MIME database ..."
 
-    $rm -rf $mimeDBDest
-    $mkdir -p $mimeDBDest
+    $rm -rf $mimeDBDest || exit 1
+    $mkdir -p $mimeDBDest || exit 1
     mimeTmpDir=$tmpDir/mime
     mimeDBTmpDir=$tmpDir/mime/db
     mimeTmpIndex=0
     mimeTmpFile=$mimeTmpDir/mimedb$$.rsrc
 
     # create tmp dir for the MIME conversion stuff
-    mkdir -p $mimeDBTmpDir
+    mkdir -p $mimeDBTmpDir || exit 1
 
     echo "Installing MIME database ..."
 
@@ -170 +170 @@
         tmpSuperDir=$mimeDBTmpDir/$superType
 
         # compile rdef to rsrc file and the rsrc file to attributes
-        $rc -o $mimeTmpFile $inSuperFile
-        mkdir -p $tmpSuperDir
-        $resattr -O -o $tmpSuperDir $mimeTmpFile
-        $rmAttrs $mimeTmpFile
+        $rc -o $mimeTmpFile $inSuperFile || exit 1
+        mkdir -p $tmpSuperDir || exit 1
+        $resattr -O -o $tmpSuperDir $mimeTmpFile || exit 1
+        $rmAttrs $mimeTmpFile || exit 1
 
         # iterate through the sub types
         for inSubFile in $mimeDBSource/$superType/*; do
@@ -183 +183 @@
                 tmpSubFile=$mimeDBTmpDir/$superType/$subType
 
                 # compile rdef to rsrc file and the rsrc file to attributes
-                $rc -o $mimeTmpFile $inSubFile
-                $resattr -O -o $tmpSubFile $mimeTmpFile
-                $rmAttrs $mimeTmpFile
+                $rc -o $mimeTmpFile $inSubFile || exit 1
+                $resattr -O -o $tmpSubFile $mimeTmpFile || exit 1
+                $rmAttrs $mimeTmpFile || exit 1
             fi
         done
     done
 
-    $cp -r ${sPrefix}$mimeDBTmpDir/. $mimeDBDest
+    $cp -r ${sPrefix}$mimeDBTmpDir/. $mimeDBDest || exit 1
 
     # cleanup tmp dir
-    $rmAttrs -rf $mimeTmpDir
+    $rmAttrs -rf $mimeTmpDir || exit 1
 fi  # ! updateOnly
 
 
@@ -202 +202 @@
 if [ ! $updateOnly ]; then
     if [ -f $copyrightsFile ]; then
         copyrightAttrs=$tmpDir/copyrightAttrs
-        $rmAttrs -f $copyrightAttrs
-        touch $copyrightAttrs
-        $addattr -f $copyrightsFile COPYRIGHTS $copyrightAttrs
-        $copyAttrs ${sPrefix}$copyrightAttrs ${tPrefix}system/apps/AboutSystem
+        $rmAttrs -f $copyrightAttrs || exit 1
+        touch $copyrightAttrs || exit 1
+        $addattr -f $copyrightsFile COPYRIGHTS $copyrightAttrs || exit 1
+        $copyAttrs ${sPrefix}$copyrightAttrs ${tPrefix}system/apps/AboutSystem || exit 1
     fi
 fi