[haiku-commits] r35784 - haiku/trunk/build/scripts

From: mattmadia@xxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Mon, 8 Mar 2010 03:28:23 +0100 (CET)
Author: mmadia
Date: 2010-03-08 03:28:23 +0100 (Mon, 08 Mar 2010)
New Revision: 35784
Changeset: http://dev.haiku-os.org/changeset/35784/haiku

Modified:
   haiku/trunk/build/scripts/build_haiku_cd
   haiku/trunk/build/scripts/build_tgz_archive
   haiku/trunk/build/scripts/build_zip_archive
Log:
Use "set -o errexit" to error out when a command failed. Make sure parent
directories are created as needed.


Modified: haiku/trunk/build/scripts/build_haiku_cd
===================================================================
--- haiku/trunk/build/scripts/build_haiku_cd    2010-03-08 02:16:05 UTC (rev 
35783)
+++ haiku/trunk/build/scripts/build_haiku_cd    2010-03-08 02:28:23 UTC (rev 
35784)
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -o errexit
 
 # The first argument is the shell script that initializes the variables:
 # sourceDir

Modified: haiku/trunk/build/scripts/build_tgz_archive
===================================================================
--- haiku/trunk/build/scripts/build_tgz_archive 2010-03-08 02:16:05 UTC (rev 
35783)
+++ haiku/trunk/build/scripts/build_tgz_archive 2010-03-08 02:28:23 UTC (rev 
35784)
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -o errexit
 
 if [ $# -lt 2 ]; then
        echo "Usage: $0 <archive> <scripts> ..."
@@ -34,7 +35,7 @@
 
 # clear output dir
 $rm -rf $outputDir
-$mkdir $outputDir
+$mkdir -p $outputDir
 
 # populate output dir
 echo "Preparing contents of archive $archive ..."
@@ -47,7 +48,7 @@
 echo "Building archive $archive ..."
 $rm -f $archive
 contents=$(cd $outputDir; ls)
-tar -C $outputDir --format ustar -czf $archive $contents || exit 1
+tar -C $outputDir --format ustar -czf $archive $contents
 
 # clean up
 $rm -rf $outputDir

Modified: haiku/trunk/build/scripts/build_zip_archive
===================================================================
--- haiku/trunk/build/scripts/build_zip_archive 2010-03-08 02:16:05 UTC (rev 
35783)
+++ haiku/trunk/build/scripts/build_zip_archive 2010-03-08 02:28:23 UTC (rev 
35784)
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -o errexit
 
 if [ $# -lt 2 ]; then
        echo "Usage: $0 <archive> <scripts> ..."
@@ -36,7 +37,7 @@
 
 # clear output dir
 $rmAttrs -rf $outputDir
-$mkdir $outputDir
+$mkdir -p $outputDir
 
 # populate output dir
 echo "Preparing contents of archive $archive ..."
@@ -55,7 +56,7 @@
 echo "Building archive $archive ..."
 $rm -f $archive
 cd $outputDir
-$zip -ryq $archive . || exit 1
+$zip -ryq $archive .
 cd $cwd
 
 # clean up
[haiku-commits] r35784 - haiku/trunk/build/scripts

Other related posts:
