opendev/gerrit
Code Issues Proposed changes

Fix bashish in bin/gerrit.sh

Browse Source 
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
This commit is contained in:
Martin Waitz
2015-01-28 13:08:41 +01:00
committed by Saša Živkov
parent e656625b2a
commit 5b4c65e0ab
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-pgm/src/main/resources/com/google/gerrit/pgm/init/gerrit.sh
View File

@@ -265,7 +265,9 @@ if test -z "$JAVA" ; then
exit 1 exit 1
fi 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. # Add Gerrit properties to Java VM options.