From dbd24d135807a246b4a9545a5b164e92f9ac8994 Mon Sep 17 00:00:00 2001
From: Bart Schuller <schuller@lunatech.com>
Date: Tue, 24 Jan 2012 10:10:39 +0100
Subject: [PATCH] Fix stderr redirect shell syntax

To prevent the following error (MacOS X 10.7):

./sbt: command substitution: line 222: syntax error near unexpected token `&'
./sbt: command substitution: line 222: `java -version |& grep version'
---
 sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sbt b/sbt
index 5c82961c0..7930e53f9 100755
--- a/sbt
+++ b/sbt
@@ -250,7 +250,7 @@ Usage: $script_name [options]
   -scala-home <path>        use the scala build at the specified directory
   -scala-version <version>  use the specified version of scala
 
-  # java version (default: java from PATH, currently $(java -version |& grep version))
+  # java version (default: java from PATH, currently $(java -version 2>&1 | grep version))
   -java-home <path>         alternate JAVA_HOME
 
   # jvm options and output control