1 --- datamodeler.orig/bin/launcher.sh 2009-06-26 03:42:40.000000000 -0300
2 +++ datamodeler/bin/launcher.sh 2009-12-03 21:47:36.000000000 -0200
3 @@ -377,22 +377,24 @@ GetDefaultJDK()
4 # Once the new path for java has been determined, truncate the /bin/java
5 # ending portion of it and set javahome with the trucated path
9 - while [ -h "$tmpvar" ]
11 - tmpvar2=`ls -ls "$tmpvar"`
12 - tmpvar2=`expr "$tmpvar2" : '.*-> \(.*\)$'`
13 - if [ `expr "$tmpvar2" : "\.\/"` -gt 0 -o `expr "$tmpvar2" : "\.\.\/"` -gt 0 -o `expr "$tmpvar2" : ".*/.*"` -le 0 ]
15 - tmpvar="`dirname "$tmpvar"`/$tmpvar2"
20 - tmpvar=`expr "$tmpvar" : '\(.*\)\/bin\/[^\/]*$'`
21 - SetJavaHome "$tmpvar"
23 +# if [ -f "$tmpvar" ]
25 +# while [ -h "$tmpvar" ]
27 +# tmpvar2=`ls -ls "$tmpvar"`
28 +# tmpvar2=`expr "$tmpvar2" : '.*-> \(.*\)$'`
29 +# if [ `expr "$tmpvar2" : "\.\/"` -gt 0 -o `expr "$tmpvar2" : "\.\.\/"` -gt 0 -o `expr "$tmpvar2" : ".*/.*"` -le 0 ]
31 +# tmpvar="`dirname "$tmpvar"`/$tmpvar2"
36 +# tmpvar=`expr "$tmpvar" : '\(.*\)\/bin\/[^\/]*$'`
37 +# SetJavaHome "$tmpvar"
39 + tmpvar=`expr "$tmpvar" : '\(.*\)\/bin\/[^\/]*$'`
40 + SetJavaHome "$tmpvar"