# HG changeset patch
# User jjg
# Date 1297304768 28800
# Node ID bfa59f3e84bde3b1f0d3c340c54b6873c856e070
# Parent  3ce4e1a07e927033bdd15ce06f8fee1aba9c0c5a
7018447: langtools launcher template fails if tools run from their own directory
Reviewed-by: jjg
Contributed-by: daniel.smith@oracle.com

diff -r 3ce4e1a07e92 -r bfa59f3e84bd src/share/bin/launcher.sh-template
--- a/src/share/bin/launcher.sh-template	Wed Feb 09 14:10:52 2011 -0800
+++ b/src/share/bin/launcher.sh-template	Wed Feb 09 18:26:08 2011 -0800
@@ -31,8 +31,7 @@
       mydir=`cygpath -m $mydir`
       ;;
 esac
-
-mylib="`dirname $mydir`"/lib
+mylib="$mydir/../lib"
 
 # By default, put the jar file and its dependencies on the bootclasspath.
 # This is always required on a Mac, because the system langtools classes
@@ -73,4 +72,4 @@
 unset DUALCASE
 
 IFS=$nl
-"#TARGET_JAVA#" "${bcp:+-Xbootclasspath/p:"$bcp"}" ${ea} ${javaOpts} -jar "${mydir}"/../lib/#PROGRAM#.jar ${toolOpts}
+"#TARGET_JAVA#" "${bcp:+-Xbootclasspath/p:"$bcp"}" ${ea} ${javaOpts} -jar "${mylib}/#PROGRAM#.jar" ${toolOpts}