[jtreg] 02/03: Replaced JTREG_HOME with JT_HOME in the launcher scripts

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jtreg.

commit b774ce669db9a299607a0f2caae11e93255d758f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jul 9 16:11:26 2014 +0200

    Replaced JTREG_HOME with JT_HOME in the launcher scripts
---
 debian/changelog               | 1 +
 debian/patches/launchers.patch | 8 ++++----
 debian/rules                   | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 05dd123..4dc215d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ jtreg (4.1-b09-1) UNRELEASED; urgency=medium
 
   * New upstream release
     - Refreshed the patches
+  * Replaced JTREG_HOME with JT_HOME in the launcher scripts (Closes: #754276)
   * Moved the package to Git
   * debian/rules: Fetch the version and the build number provided
     to the Ant script from the version of the package
diff --git a/debian/patches/launchers.patch b/debian/patches/launchers.patch
index 89291f7..282acd3 100644
--- a/debian/patches/launchers.patch
+++ b/debian/patches/launchers.patch
@@ -72,14 +72,14 @@
 -elif [ "$version" -lt 5 ]; then
 -    echo "java version 5 or later is required to run jtdiff"
 -    exit 1;
-+if [ -z "${JTREG_HOME}" ]; then
++if [ -z "${JT_HOME}" ] || [ ! -f "${JT_HOME}/jtreg.jar" ]; then
 +    JT_HOME="/usr/share/java"
  fi
  
 +
  # And finally ...
  
-+JT_CLASSPATH="${JTREG_HOME}/jtreg.jar:/usr/share/java/javatest.jar:/usr/share/java/jh.jar:/usr/share/java/junit4.jar"
++JT_CLASSPATH="${JT_HOME}/jtreg.jar:/usr/share/java/javatest.jar:/usr/share/java/jh.jar:/usr/share/java/junit4.jar"
 +
  IFS=$nl
  
@@ -164,13 +164,13 @@
 -elif [ "$version" -lt 5 ]; then
 -    echo "java version 5 or later is required to run jtreg"
 -    exit 1;
-+if [ -z "${JTREG_HOME}" ]; then
++if [ -z "${JT_HOME}" ] || [ ! -f "${JT_HOME}/jtreg.jar" ]; then
 +    JT_HOME="/usr/share/java"
  fi
  
  # And finally ...
  
-+JT_CLASSPATH="${JTREG_HOME}/jtreg.jar:/usr/share/java/javatest.jar:/usr/share/java/jh.jar:/usr/share/java/junit4.jar"
++JT_CLASSPATH="${JT_HOME}/jtreg.jar:/usr/share/java/javatest.jar:/usr/share/java/jh.jar:/usr/share/java/junit4.jar"
 +
  IFS=$nl
  
diff --git a/debian/rules b/debian/rules
index 08e7ff5..ca89fc2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,8 +20,8 @@ override_dh_auto_build:
 	dh_auto_build
 
 	# Generate the manpages
-	JTREG_HOME=./dist/jtreg/lib/ help2man --name="Regression Test Harness" --help-option="-help all" dist/jtreg/linux/bin/jtdiff > jtdiff.1
-	JTREG_HOME=./dist/jtreg/lib/ help2man --name="Regression Test Harness" --help-option="-help all" dist/jtreg/linux/bin/jtreg > jtreg.1
+	JT_HOME=./dist/jtreg/lib/ help2man --name="Regression Test Harness" --help-option="-help all" dist/jtreg/linux/bin/jtdiff > jtdiff.1
+	JT_HOME=./dist/jtreg/lib/ help2man --name="Regression Test Harness" --help-option="-help all" dist/jtreg/linux/bin/jtreg > jtreg.1
 
 override_dh_auto_clean:
 	rm -rf dist

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jtreg.git