| commit | 5b4c65e0ab4f0663a13ae919c0e636d52833e1bf | [log] [tgz] |
|---|---|---|
| author | Martin Waitz <tali@admingilde.org> | Wed Jan 28 13:08:41 2015 +0100 |
| committer | Saša Živkov <zivkov@gmail.com> | Wed Jan 28 12:45:26 2015 +0000 |
| tree | 4227c26d9c838cd09835c7e642cc6c1cca260f09 | |
| parent | e656625b2a98c3f115ac731f8a37060057535663 [diff] |
Fix bashish in bin/gerrit.sh The Gerrit init script uses a bashism to detect the location of jstack. Instead of calculating it by trimming $JAVA, use $JAVA_HOME to obtain the location of 'jstack'. Also honor for the environment variable $JSTACK. Change-Id: I94f0c672492becd6cdcc07769a7c70b290d222d4
diff --git a/gerrit-pgm/src/main/resources/com/google/gerrit/pgm/init/gerrit.sh b/gerrit-pgm/src/main/resources/com/google/gerrit/pgm/init/gerrit.sh index a5a8ed5..7e6f943 100755 --- a/gerrit-pgm/src/main/resources/com/google/gerrit/pgm/init/gerrit.sh +++ b/gerrit-pgm/src/main/resources/com/google/gerrit/pgm/init/gerrit.sh
@@ -265,7 +265,9 @@ exit 1 fi -JSTACK=${JAVA:0:${#JAVA}-5}/jstack +if test -z "$JSTACK"; then + JSTACK="$JAVA_HOME/bin/jstack" +fi ##################################################### # Add Gerrit properties to Java VM options.