Package: jets3t / 0.7.4+dfsg-1

06_fix_scripts.diff Patch series | download
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
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
Author: Miguel Landaeta <miguel@miguel.cc>
Subject: set correct location of libraries in jets3t scripts

This patch set the location of default JAVA_HOME and the location of some
needed libraries in jets3t scripts.

--- jets3t-0.7.4+dfsg.orig/bin/cockpit.sh
+++ jets3t-0.7.4+dfsg/bin/cockpit.sh
@@ -8,8 +8,8 @@
 #              Java Development Kit to use. 
 # -------------------------------------------------------------------
 
-: ${JETS3T_HOME:-""}
-: ${JAVA_HOME:-""}
+: ${JETS3T_HOME:="/usr/share/jets3t"}
+: ${JAVA_HOME:="/usr/lib/jvm/default-java"}
 
 # Check the JETS3T_HOME directory
 
@@ -50,17 +50,19 @@ CP=$CLASSPATH:$JETS3T_HOME/configs
 # Include resources directory in classpath
 CP=$CP:$JETS3T_HOME/resources
 
+# System libraries path
+: ${JAVA_LIBS:="/usr/share/java"}
+
 # Include libraries in classpath
-CP=$CP:$JETS3T_HOME/jars/jets3t-0.7.4.jar
-CP=$CP:$JETS3T_HOME/jars/jets3t-gui-0.7.4.jar
-CP=$CP:$JETS3T_HOME/jars/cockpit-0.7.4.jar
-CP=$CP:$JETS3T_HOME/libs/commons-logging/commons-logging-1.1.1.jar
-CP=$CP:$JETS3T_HOME/libs/commons-codec/commons-codec-1.3.jar
-CP=$CP:$JETS3T_HOME/libs/commons-httpclient/commons-httpclient-3.1.jar
-CP=$CP:$JETS3T_HOME/libs/misc/BareBonesBrowserLaunch.jar
-CP=$CP:$JETS3T_HOME/libs/logging-log4j/log4j-1.2.15.jar
-CP=$CP:$JETS3T_HOME/libs/bouncycastle/bcprov-jdk14-138.jar
-CP=$CP:$JETS3T_HOME/libs/java-xmlbuilder/java-xmlbuilder-1.jar
+CP=$CP:$JAVA_LIBS/jets3t.jar
+CP=$CP:$JAVA_LIBS/jets3t-gui.jar
+CP=$CP:$JAVA_LIBS/jets3t-cockpit.jar
+CP=$CP:$JAVA_LIBS/jets3t-deps.jar
+CP=$CP:$JAVA_LIBS/commons-logging.jar
+CP=$CP:$JAVA_LIBS/commons-codec.jar
+CP=$CP:$JAVA_LIBS/commons-httpclient.jar
+CP=$CP:$JAVA_LIBS/log4j-1.2.jar
+CP=$CP:$JAVA_LIBS/bcprov.jar
 
 # Convert classpath for cygwin bash
 case "`uname -s`" in
--- jets3t-0.7.4+dfsg.orig/bin/cockpitlite.sh
+++ jets3t-0.7.4+dfsg/bin/cockpitlite.sh
@@ -8,8 +8,8 @@
 #              Java Development Kit to use. 
 # -------------------------------------------------------------------
 
-: ${JETS3T_HOME:-""}
-: ${JAVA_HOME:-""}
+: ${JETS3T_HOME:="/usr/share/jets3t"}
+: ${JAVA_HOME:="/usr/lib/jvm/default-java"}
 
 # Check the JETS3T_HOME directory
 
@@ -50,16 +50,19 @@ CP=$CLASSPATH:$JETS3T_HOME/configs
 # Include resources directory in classpath
 CP=$CP:$JETS3T_HOME/resources
 
+# System libraries path
+: ${JAVA_LIBS:="/usr/share/java"}
+
 # Include libraries in classpath
-CP=$CP:$JETS3T_HOME/jars/jets3t-0.7.4.jar
-CP=$CP:$JETS3T_HOME/jars/jets3t-gui-0.7.4.jar
-CP=$CP:$JETS3T_HOME/jars/cockpitlite-0.7.4.jar
-CP=$CP:$JETS3T_HOME/libs/commons-logging/commons-logging-1.1.1.jar
-CP=$CP:$JETS3T_HOME/libs/commons-codec/commons-codec-1.3.jar
-CP=$CP:$JETS3T_HOME/libs/commons-httpclient/commons-httpclient-3.1.jar
-CP=$CP:$JETS3T_HOME/libs/misc/BareBonesBrowserLaunch.jar
-CP=$CP:$JETS3T_HOME/libs/logging-log4j/log4j-1.2.15.jar
-CP=$CP:$JETS3T_HOME/libs/bouncycastle/bcprov-jdk14-138.jar
+CP=$CP:$JAVA_LIBS/jets3t.jar
+CP=$CP:$JAVA_LIBS/jets3t-gui.jar
+CP=$CP:$JAVA_LIBS/jets3t-cockpitlite.jar
+CP=$CP:$JAVA_LIBS/jets3t-deps.jar
+CP=$CP:$JAVA_LIBS/commons-logging.jar
+CP=$CP:$JAVA_LIBS/commons-codec.jar
+CP=$CP:$JAVA_LIBS/commons-httpclient.jar
+CP=$CP:$JAVA_LIBS/log4j-1.2.jar
+CP=$CP:$JAVA_LIBS/bcprov.jar
 
 # Convert classpath for cygwin bash
 case "`uname -s`" in
--- jets3t-0.7.4+dfsg.orig/bin/uploader.sh
+++ jets3t-0.7.4+dfsg/bin/uploader.sh
@@ -8,8 +8,8 @@
 #              Java Development Kit to use. 
 # -------------------------------------------------------------------
 
-: ${JETS3T_HOME:-""}
-: ${JAVA_HOME:-""}
+: ${JETS3T_HOME:="/usr/share/jets3t"}
+: ${JAVA_HOME:="/usr/lib/jvm/default-java"}
 
 # Check the JETS3T_HOME directory
 
@@ -50,15 +50,18 @@ CP=$CLASSPATH:$JETS3T_HOME/configs
 # Include resources directory in classpath
 CP=$CP:$JETS3T_HOME/resources
 
+# System libraries path
+: ${JAVA_LIBS:="/usr/share/java"}
+
 # Include libraries in classpath
-CP=$CP:$JETS3T_HOME/jars/jets3t-0.7.4.jar
-CP=$CP:$JETS3T_HOME/jars/jets3t-gui-0.7.4.jar
-CP=$CP:$JETS3T_HOME/jars/uploader-0.7.4.jar
-CP=$CP:$JETS3T_HOME/libs/commons-logging/commons-logging-1.1.1.jar
-CP=$CP:$JETS3T_HOME/libs/commons-codec/commons-codec-1.3.jar
-CP=$CP:$JETS3T_HOME/libs/commons-httpclient/commons-httpclient-3.1.jar
-CP=$CP:$JETS3T_HOME/libs/misc/BareBonesBrowserLaunch.jar
-CP=$CP:$JETS3T_HOME/libs/logging-log4j/log4j-1.2.15.jar
+CP=$CP:$JAVA_LIBS/jets3t.jar
+CP=$CP:$JAVA_LIBS/jets3t-gui.jar
+CP=$CP:$JAVA_LIBS/jets3t-uploader.jar
+CP=$CP:$JAVA_LIBS/jets3t-deps.jar
+CP=$CP:$JAVA_LIBS/commons-logging.jar
+CP=$CP:$JAVA_LIBS/commons-codec.jar
+CP=$CP:$JAVA_LIBS/commons-httpclient.jar
+CP=$CP:$JAVA_LIBS/log4j-1.2.jar
 
 # Convert classpath for cygwin bash
 case "`uname -s`" in
--- jets3t-0.7.4+dfsg.orig/bin/synchronize.sh
+++ jets3t-0.7.4+dfsg/bin/synchronize.sh
@@ -8,8 +8,8 @@
 #              Java Development Kit to use. 
 # -------------------------------------------------------------------
 
-: ${JETS3T_HOME:-""}
-: ${JAVA_HOME:-""}
+: ${JETS3T_HOME:="/usr/share/jets3t"}
+: ${JAVA_HOME:="/usr/lib/jvm/default-java"}
 
 # Check the JETS3T_HOME directory
 
@@ -50,14 +50,17 @@ CP=$CLASSPATH:$JETS3T_HOME/configs
 # Include resources directory in classpath
 CP=$CP:$JETS3T_HOME/resources
 
+# System libraries path
+: ${JAVA_LIBS:="/usr/share/java"}
+
 # Include libraries in classpath
-CP=$CP:$JETS3T_HOME/jars/jets3t-0.7.4.jar
-CP=$CP:$JETS3T_HOME/jars/synchronize-0.7.4.jar
-CP=$CP:$JETS3T_HOME/libs/commons-logging/commons-logging-1.1.1.jar
-CP=$CP:$JETS3T_HOME/libs/commons-codec/commons-codec-1.3.jar
-CP=$CP:$JETS3T_HOME/libs/commons-httpclient/commons-httpclient-3.1.jar
-CP=$CP:$JETS3T_HOME/libs/logging-log4j/log4j-1.2.15.jar
-CP=$CP:$JETS3T_HOME/libs/bouncycastle/bcprov-jdk14-138.jar
+CP=$CP:$JAVA_LIBS/jets3t.jar
+CP=$CP:$JAVA_LIBS/jets3t-synchronize.jar
+CP=$CP:$JAVA_LIBS/commons-logging.jar
+CP=$CP:$JAVA_LIBS/commons-codec.jar
+CP=$CP:$JAVA_LIBS/commons-httpclient.jar
+CP=$CP:$JAVA_LIBS/log4j-1.2.jar
+CP=$CP:$JAVA_LIBS/bcprov.jar
 
 # Convert classpath for cygwin bash
 case "`uname -s`" in