Wed, 09 Feb 2011 18:26:08 -0800
7018447: langtools launcher template fails if tools run from their own directory
Reviewed-by: jjg
Contributed-by: daniel.smith@oracle.com
src/share/bin/launcher.sh-template | file | annotate | diff | comparison | revisions |
1.1 --- a/src/share/bin/launcher.sh-template Wed Feb 09 14:10:52 2011 -0800 1.2 +++ b/src/share/bin/launcher.sh-template Wed Feb 09 18:26:08 2011 -0800 1.3 @@ -31,8 +31,7 @@ 1.4 mydir=`cygpath -m $mydir` 1.5 ;; 1.6 esac 1.7 - 1.8 -mylib="`dirname $mydir`"/lib 1.9 +mylib="$mydir/../lib" 1.10 1.11 # By default, put the jar file and its dependencies on the bootclasspath. 1.12 # This is always required on a Mac, because the system langtools classes 1.13 @@ -73,4 +72,4 @@ 1.14 unset DUALCASE 1.15 1.16 IFS=$nl 1.17 -"#TARGET_JAVA#" "${bcp:+-Xbootclasspath/p:"$bcp"}" ${ea} ${javaOpts} -jar "${mydir}"/../lib/#PROGRAM#.jar ${toolOpts} 1.18 +"#TARGET_JAVA#" "${bcp:+-Xbootclasspath/p:"$bcp"}" ${ea} ${javaOpts} -jar "${mylib}/#PROGRAM#.jar" ${toolOpts}