Changeset 808db8e in rtems

Timestamp:

08/04/06 09:48:38 (17 years ago)

Author:

Chris Johns <chrisj@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

1a768ef

Parents:

5aafd7a

Message:

Fix the return code when used with tee.

File:

• contrib/mingw/build.sh (modified) (4 diffs)

contrib/mingw/build.sh

@@ +1 @@
+#! /bin/sh
 #
 # $Id$
@@ -9 +10 @@
 #
 
+command_line="$0 $*"
+
 terminate()
 {
   echo "error: $*" >&2
   exit 1
+  echo "after"
 }
 
@@ -18 +22 @@
 {
  if [ $? -ne 0 ]; then
-  terminate
+  terminate $*
  fi
 }
@@ -81 +85 @@
 done
 
+echo "$command_line" > $log
+
 scripts=$(dirname $0)
 
-$scripts/build-rpms.sh -i $debug $no_run $prefix $source $targets $hosts $version 2>&1 | tee $log
-check "Making the RPM files."
+$scripts/build-rpms.sh -i $debug $no_run $prefix $source $targets $hosts $version 2>&1 | tee -a $log
+if [ ${PIPESTATUS[0]} -ne 0 ]; then
+ terminate "Making the RPM files."
+fi
 
 $scripts/build-exes.sh $debug $no_run $prefix $targets $relocation 2>&1 | tee -a $log
-check "Making the executable files."
+if [ ${PIPESTATUS[0]} -ne 0 ]; then
+ terminate "Making the executable files."
+fi
 
+exit 0