Ticket #5256: build_haiku_imageExitOnUnzipFailureParanoid.patch
File build_haiku_imageExitOnUnzipFailureParanoid.patch, 3.4 KB (added by , 14 years ago) |
---|
-
build/scripts/build_haiku_image
79 79 echo "Unzipping $zipFile ..." 80 80 81 81 unzipDir=$tmpDir/unzip 82 $rmAttrs -rf "$unzipDir" 83 mkdir -p "$unzipDir" 82 $rmAttrs -rf "$unzipDir" || exit 1 83 mkdir -p "$unzipDir" || exit 1 84 84 85 85 $unzip -q -d "$unzipDir" "$zipFile" 86 86 … … 90 90 rm $unzipDir/.OptionalPackageDescription 91 91 fi 92 92 93 $cp -r "${sPrefix}$unzipDir/." "${tPrefix}$targetUnzipDir" 93 $cp -r "${sPrefix}$unzipDir/." "${tPrefix}$targetUnzipDir" || exit 1 94 94 95 $rmAttrs -rf "$unzipDir" 95 $rmAttrs -rf "$unzipDir" || exit 1 96 96 } 97 97 98 98 99 mkdir -p $tmpDir 99 mkdir -p $tmpDir || exit 1 100 100 copyrightsFile=$tmpDir/copyrights 101 $rmAttrs -f $copyrightsFile 101 $rmAttrs -f $copyrightsFile || exit 1 102 102 if [ "$optionalPackageDescriptions" ]; then 103 cp "$optionalPackageDescriptions" $copyrightsFile 103 cp "$optionalPackageDescriptions" $copyrightsFile || exit 1 104 104 fi 105 105 106 106 … … 129 129 130 130 $bfsShell --initialize $imageOffsetFlags "$imagePath" \ 131 131 "$imageLabel" "block_size 2048" || exit 1 132 $makebootable $imageOffsetFlags "$imagePath" 132 $makebootable $imageOffsetFlags "$imagePath" || exit 1 133 133 fi 134 134 $bfsShell -n $imageOffsetFlags "$imagePath" > /dev/null & 135 135 sleep 1 … … 153 153 154 154 echo "Deleting old MIME database ..." 155 155 156 $rm -rf $mimeDBDest 157 $mkdir -p $mimeDBDest 156 $rm -rf $mimeDBDest || exit 1 157 $mkdir -p $mimeDBDest || exit 1 158 158 mimeTmpDir=$tmpDir/mime 159 159 mimeDBTmpDir=$tmpDir/mime/db 160 160 mimeTmpIndex=0 161 161 mimeTmpFile=$mimeTmpDir/mimedb$$.rsrc 162 162 163 163 # create tmp dir for the MIME conversion stuff 164 mkdir -p $mimeDBTmpDir 164 mkdir -p $mimeDBTmpDir || exit 1 165 165 166 166 echo "Installing MIME database ..." 167 167 … … 170 170 tmpSuperDir=$mimeDBTmpDir/$superType 171 171 172 172 # compile rdef to rsrc file and the rsrc file to attributes 173 $rc -o $mimeTmpFile $inSuperFile 174 mkdir -p $tmpSuperDir 175 $resattr -O -o $tmpSuperDir $mimeTmpFile 176 $rmAttrs $mimeTmpFile 173 $rc -o $mimeTmpFile $inSuperFile || exit 1 174 mkdir -p $tmpSuperDir || exit 1 175 $resattr -O -o $tmpSuperDir $mimeTmpFile || exit 1 176 $rmAttrs $mimeTmpFile || exit 1 177 177 178 178 # iterate through the sub types 179 179 for inSubFile in $mimeDBSource/$superType/*; do … … 183 183 tmpSubFile=$mimeDBTmpDir/$superType/$subType 184 184 185 185 # compile rdef to rsrc file and the rsrc file to attributes 186 $rc -o $mimeTmpFile $inSubFile 187 $resattr -O -o $tmpSubFile $mimeTmpFile 188 $rmAttrs $mimeTmpFile 186 $rc -o $mimeTmpFile $inSubFile || exit 1 187 $resattr -O -o $tmpSubFile $mimeTmpFile || exit 1 188 $rmAttrs $mimeTmpFile || exit 1 189 189 fi 190 190 done 191 191 done 192 192 193 $cp -r ${sPrefix}$mimeDBTmpDir/. $mimeDBDest 193 $cp -r ${sPrefix}$mimeDBTmpDir/. $mimeDBDest || exit 1 194 194 195 195 # cleanup tmp dir 196 $rmAttrs -rf $mimeTmpDir 196 $rmAttrs -rf $mimeTmpDir || exit 1 197 197 fi # ! updateOnly 198 198 199 199 … … 202 202 if [ ! $updateOnly ]; then 203 203 if [ -f $copyrightsFile ]; then 204 204 copyrightAttrs=$tmpDir/copyrightAttrs 205 $rmAttrs -f $copyrightAttrs 206 touch $copyrightAttrs 207 $addattr -f $copyrightsFile COPYRIGHTS $copyrightAttrs 208 $copyAttrs ${sPrefix}$copyrightAttrs ${tPrefix}system/apps/AboutSystem 205 $rmAttrs -f $copyrightAttrs || exit 1 206 touch $copyrightAttrs || exit 1 207 $addattr -f $copyrightsFile COPYRIGHTS $copyrightAttrs || exit 1 208 $copyAttrs ${sPrefix}$copyrightAttrs ${tPrefix}system/apps/AboutSystem || exit 1 209 209 fi 210 210 fi 211 211