summarylogtreecommitdiffstats
path: root/dirstructure.patch
blob: af9d93e5b8459d97cb771473da7dd2efd3d1573d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
diff -Naur tr-2.0.1.original/bin/tr tr-2.0.1/bin/tr
--- tr-2.0.1.original/bin/tr	2009-02-17 13:35:16.000000000 +0100
+++ tr-2.0.1/bin/tr	2009-02-17 13:36:44.000000000 +0100
@@ -16,11 +16,15 @@
     fi
 done
 
-progdir=`dirname "$PRG"`
-APPNAME=`basename "$0"`
+progdir=/opt/thinkingrock
+APPNAME=tr
 
-if [ -f "$progdir/../etc/$APPNAME".conf ] ; then
-    . "$progdir/../etc/$APPNAME".conf
+
+jdkhome=/usr/lib/jvm/java-6-jre/jre
+
+
+if [ -f "$progdir/etc/$APPNAME".conf ] ; then
+    . "$progdir/etc/$APPNAME".conf
 fi
 
 # XXX does not correctly deal with spaces in non-userdir params
@@ -48,9 +52,9 @@
     . "${userdir}/etc/$APPNAME".conf
 fi
 
-if [ -n "$jdkhome" -a \! -d "$jdkhome" -a -d "$progdir/../$jdkhome" ]; then
+if [ -n "$jdkhome" -a \! -d "$jdkhome" -a -d "$progdir/$jdkhome" ]; then
     # #74333: permit jdkhome to be defined as relative to app dir
-    jdkhome="$progdir/../$jdkhome"
+    jdkhome="$progdir/$jdkhome"
 fi
 
 readClusters() {
@@ -61,18 +65,18 @@
   fi
   while read X; do
     if [ "$X" \!= "" ]; then
-      $echo "$progdir/../$X"
+      $echo "$progdir/$X"
     fi
   done
 }
 
-clusters=`(cat "$progdir/../etc/$APPNAME".clusters; echo) | readClusters | tr '\012' ':'`
+clusters=`(cat "$progdir/etc/$APPNAME".clusters; echo) | readClusters | tr '\012' ':'`
 
 if [ ! -z "$extraclusters" ] ; then
     clusters="$clusters:$extraclusters"
 fi
 
-nbexec=`echo "$progdir"/../platform*/lib/nbexec`
+nbexec=`echo "$progdir"/platform*/lib/nbexec`
 
 case "`uname`" in
     Darwin*)
@@ -80,7 +84,7 @@
             --jdkhome '"$jdkhome"' \
             -J-Dcom.apple.mrj.application.apple.menu.about.name='ThinkingRock' \
             -J-Xdock:name='ThinkingRock' \
-            '"-J-Xdock:icon=$progdir/../../$APPNAME.icns"' \
+            '"-J-Xdock:icon=$progdir/../$APPNAME.icns"' \
             --branding '"$APPNAME"' \
             --clusters '"$clusters"' \
             --userdir '"${userdir}"' \