From d08a619acc70df0c59836be0b6eda01c976bdf35 Mon Sep 17 00:00:00 2001
From: "Eric J. Korpela" <korpela@ssl.berkeley.edu>
Date: Fri, 24 Aug 2012 00:36:13 +0000
Subject: [PATCH] - fixed bug in generate_svn_version.sh that generated
 incorrect output   on unix systems that don't synchronize writes to the same
 file from   opposite sides of a pipe.

svn path=/trunk/boinc/; revision=26058
---
 checkin_notes           |  8 ++++++++
 generate_svn_version.sh | 16 +++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 23eed359ed..d50a076071 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -5694,3 +5694,11 @@ Rom    22 Aug 2012
     client/
         cs_cmdline.cpp
         main.cpp
+
+Eric K 23 Aug 2012
+    - build environment:  fixed bug in generate_svn_version.sh that generated
+        incorrect output on unix systems that don't synchronize writes to the
+        same file from opposite sides of a pipe.
+    /
+        generate_svn_version.sh
+
diff --git a/generate_svn_version.sh b/generate_svn_version.sh
index f78798be50..8f8de4c9b0 100644
--- a/generate_svn_version.sh
+++ b/generate_svn_version.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 HEADER="svn_version.h"
 TMPFILE="$HEADER.tmp"
@@ -32,17 +32,19 @@ if [ "x$GIT_LOG" != "x" ]; then
                  y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/;
                  s/^/#define REPOSITORY_/;s/$/ 1/' >> $TMPFILE
 elif [ "x$CMD" != "x" ]; then
-    LANG=C $CMD |
-           awk '/^URL/ { url = $2; };
+    LANG=C 
+    URL=`$CMD | awk '
+                /^URL/ { url = $2; };
                 /^Rev/ { rev = $2; };
                 END { print "#define SVN_VERSION \"Repository: " url \
                             " Revision: " rev "\"" >> "'"$TMPFILE"'";
                       print "#define SVN_REPOSITORY \"" url "\"" >> "'"$TMPFILE"'";
                       print "#define SVN_REVISION " rev >> "'"$TMPFILE"'";
-                      print url };' |
-            sed 's%.*://%%;s/[^/]*@//;s/[^a-zA-Z0-9]/_/g;s/__*/_/g;
-                 y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/;
-                 s/^/#define REPOSITORY_/;s/$/ 1/' >> $TMPFILE
+                      print url };'`
+    echo $URL | 
+        sed 's%.*://%%;s/[^/]*@//;s/[^a-zA-Z0-9]/_/g;s/__*/_/g;
+             y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/;
+             s/^/#define REPOSITORY_/;s/$/ 1/' >> $TMPFILE
 else
     echo "#include \"version.h\"" >> $TMPFILE
     echo "#define SVN_VERSION BOINC_VERSION_STRING" >> $TMPFILE