commit 0b75cddd133d2ecf5022bfd6b31b99c60dccc742 parent 2287fa5fdeccc9a840496b71e22a9822a8a8ee9b Author: Brendan Gregg <brendan.d.gregg@gmail.com> Date: Tue, 2 May 2017 12:48:23 -0700 Merge pull request #131 from mindprince/java-home-fix jmaps: read JAVA_HOME from environment variable if set. Diffstat:
| M | jmaps | | | 4 | ++-- |
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/jmaps b/jmaps @@ -25,8 +25,8 @@ # 13-Feb-2015 Brendan Gregg Created this. # 20-Feb-2017 " " Added -u for unfoldall. -JAVA_HOME=/usr/lib/jvm/java-8-oracle -AGENT_HOME=/usr/lib/jvm/perf-map-agent # from https://github.com/jrudolph/perf-map-agent +JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-8-oracle} +AGENT_HOME=/usr/lib/jvm/perf-map-agent # from https://github.com/jvm-profiling-tools/perf-map-agent debug=0 if [[ "$USER" != root ]]; then