From 64b1446e26f82b2fb9a6a62c046c290e85cd73a5 Mon Sep 17 00:00:00 2001
From: "Shawn O. Pearce" <sop@google.com>
Date: Tue, 5 Apr 2011 14:20:02 -0400
Subject: [PATCH] gerrit.sh: Support spaces in JAVA_HOME

Mac OS X may have spaces in its JAVA_HOME path, so support those by
avoiding contexts where it isn't properly quoted or protected from the
shell splitting rules.

Change-Id: I228c3e6456009ffb4adec7d1a385ea0d333258d0
Signed-off-by: Shawn O. Pearce <sop@google.com>
---
 .../main/resources/com/google/gerrit/pgm/gerrit.sh   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gerrit-pgm/src/main/resources/com/google/gerrit/pgm/gerrit.sh b/gerrit-pgm/src/main/resources/com/google/gerrit/pgm/gerrit.sh
index 96e7dbb290..eb26b09c3c 100755
--- a/gerrit-pgm/src/main/resources/com/google/gerrit/pgm/gerrit.sh
+++ b/gerrit-pgm/src/main/resources/com/google/gerrit/pgm/gerrit.sh
@@ -269,8 +269,11 @@ if test -z "$JAVA_HOME" ; then
     echo "** INFO: Using $JAVA"
 fi
 
-if test -z "$JAVA" -a -n "$JAVA_HOME" ; then
-  test -x $JAVA_HOME/bin/java -a ! -d $JAVA_HOME/bin/java && JAVA=$JAVA_HOME/bin/java
+if test -z "$JAVA" \
+     -a -n "$JAVA_HOME" \
+     -a -x "$JAVA_HOME/bin/java" \
+     -a ! -d "$JAVA_HOME/bin/java" ; then
+  JAVA="$JAVA_HOME/bin/java"
 fi
 
 if test -z "$JAVA" ; then
@@ -354,10 +357,11 @@ if test -x /usr/bin/perl ; then
   # If possible, use Perl to mask the name of the process so its
   # something specific to us rather than the generic 'java' name.
   #
+  export JAVA
   RUN_EXEC=/usr/bin/perl
   RUN_Arg1=-e
-  RUN_Arg2='$x=shift @ARGV;exec $x @ARGV;die $!'
-  RUN_Arg3="-- $JAVA GerritCodeReview"
+  RUN_Arg2='$x=$ENV{JAVA};exec $x @ARGV;die $!'
+  RUN_Arg3='-- GerritCodeReview'
 else
   RUN_EXEC=$JAVA
   RUN_Arg1=