File: 02_fix_scripts.diff

package info (click to toggle)
svnkit 1.3.5%2Bdfsg-4
  • links: PTS, VCS
  • area: main
  • in suites: wheezy
  • size: 9,116 kB
  • sloc: java: 109,839; xml: 990; sh: 193; makefile: 25
file content (110 lines) | stat: -rw-r--r-- 4,876 bytes parent folder | download | duplicates (2)
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
Author: Miguel Landaeta <miguel@miguel.cc>
Subject: correct location of libraries in svnkit scripts
diff --git a/svnkit-cli/scripts/jsvn b/svnkit-cli/scripts/jsvn
index 3faf309..44e9666 100644
--- a/svnkit-cli/scripts/jsvn
+++ b/svnkit-cli/scripts/jsvn
@@ -25,10 +25,12 @@ done
 
 SVNKIT_HOME=`dirname $prg`
 SVNKIT_HOME=`cd "$SVNKIT_HOME" ; pwd`
+JAVA_LIBS=/usr/share/java
+JAVA_HOME=/usr/lib/jvm/default-java
 
 cd "$old_wd"
 
-SVNKIT_CP="$SVNKIT_HOME/svnkit.jar":"$SVNKIT_HOME/svnkit-cli.jar":"$SVNKIT_HOME/trilead.jar":"$SVNKIT_HOME/jna.jar":"$SVNKIT_HOME/sqljet.%sqljet.version%.jar":"$SVNKIT_HOME/antlr-runtime-%antlr.version%.jar"
+SVNKIT_CP="$JAVA_LIBS/svnkit.jar":"$SVNKIT_HOME/svnkit-cli.jar":"$JAVA_LIBS/trilead-ssh2.jar":"$JAVA_LIBS/jna.jar":"$JAVA_LIBS/sqljet.jar":"$JAVA_LIBS/antlr3.jar"
 
 if $cygwin ; then
   SVNKIT_CP=`cygpath --windows --path "$SVNKIT_CP"`
diff --git a/svnkit-cli/scripts/jsvnadmin b/svnkit-cli/scripts/jsvnadmin
index b2ab9dd..db91495 100644
--- a/svnkit-cli/scripts/jsvnadmin
+++ b/svnkit-cli/scripts/jsvnadmin
@@ -25,10 +25,12 @@ done
 
 SVNKIT_HOME=`dirname $prg`
 SVNKIT_HOME=`cd "$SVNKIT_HOME" ; pwd`
+JAVA_LIBS=/usr/share/java
+JAVA_HOME=/usr/lib/jvm/default-java
 
 cd "$old_wd"
 
-SVNKIT_CP="$SVNKIT_HOME/svnkit.jar":"$SVNKIT_HOME/svnkit-cli.jar":"$SVNKIT_HOME/trilead.jar":"$SVNKIT_HOME/jna.jar":"$SVNKIT_HOME/sqljet.%sqljet.version%.jar":"$SVNKIT_HOME/antlr-runtime-%antlr.version%.jar"
+SVNKIT_CP="$JAVA_LIBS/svnkit.jar":"$SVNKIT_HOME/svnkit-cli.jar":"$JAVA_LIBS/trilead-ssh2.jar":"$JAVA_LIBS/jna.jar":"$JAVA_LIBS/sqljet.jar":"$JAVA_LIBS/antlr3.jar"
 
 if $cygwin ; then
   SVNKIT_CP=`cygpath --windows --path "$SVNKIT_CP"`
diff --git a/svnkit-cli/scripts/jsvndumpfilter b/svnkit-cli/scripts/jsvndumpfilter
index 6a7a428..3af218b 100644
--- a/svnkit-cli/scripts/jsvndumpfilter
+++ b/svnkit-cli/scripts/jsvndumpfilter
@@ -25,10 +25,12 @@ done
 
 SVNKIT_HOME=`dirname $prg`
 SVNKIT_HOME=`cd "$SVNKIT_HOME" ; pwd`
+JAVA_LIBS=/usr/share/java
+JAVA_HOME=/usr/lib/jvm/default-java
 
 cd "$old_wd"
 
-SVNKIT_CP="$SVNKIT_HOME/svnkit.jar":"$SVNKIT_HOME/svnkit-cli.jar":"$SVNKIT_HOME/trilead.jar":"$SVNKIT_HOME/jna.jar":"$SVNKIT_HOME/sqljet.%sqljet.version%.jar":"$SVNKIT_HOME/antlr-runtime-%antlr.version%.jar"
+SVNKIT_CP="$JAVA_LIBS/svnkit.jar":"$SVNKIT_HOME/svnkit-cli.jar":"$JAVA_LIBS/trilead-ssh2.jar":"$JAVA_LIBS/jna.jar":"$JAVA_LIBS/sqljet.jar":"$JAVA_LIBS/antlr3.jar"
 
 if $cygwin ; then
   SVNKIT_CP=`cygpath --windows --path "$SVNKIT_CP"`
diff --git a/svnkit-cli/scripts/jsvnlook b/svnkit-cli/scripts/jsvnlook
index 6b208f8..2c43140 100644
--- a/svnkit-cli/scripts/jsvnlook
+++ b/svnkit-cli/scripts/jsvnlook
@@ -25,10 +25,12 @@ done
 
 SVNKIT_HOME=`dirname $prg`
 SVNKIT_HOME=`cd "$SVNKIT_HOME" ; pwd`
+JAVA_LIBS=/usr/share/java
+JAVA_HOME=/usr/lib/jvm/default-java
 
 cd "$old_wd"
 
-SVNKIT_CP="$SVNKIT_HOME/svnkit.jar":"$SVNKIT_HOME/svnkit-cli.jar":"$SVNKIT_HOME/trilead.jar":"$SVNKIT_HOME/jna.jar":"$SVNKIT_HOME/sqljet.%sqljet.version%.jar":"$SVNKIT_HOME/antlr-runtime-%antlr.version%.jar"
+SVNKIT_CP="$JAVA_LIBS/svnkit.jar":"$SVNKIT_HOME/svnkit-cli.jar":"$JAVA_LIBS/trilead-ssh2.jar":"$JAVA_LIBS/jna.jar":"$JAVA_LIBS/sqljet.jar":"$JAVA_LIBS/antlr3.jar"
 
 if $cygwin ; then
   SVNKIT_CP=`cygpath --windows --path "$SVNKIT_CP"`
diff --git a/svnkit-cli/scripts/jsvnsync b/svnkit-cli/scripts/jsvnsync
index 266fcb4..3fab22d 100644
--- a/svnkit-cli/scripts/jsvnsync
+++ b/svnkit-cli/scripts/jsvnsync
@@ -25,10 +25,12 @@ done
 
 SVNKIT_HOME=`dirname $prg`
 SVNKIT_HOME=`cd "$SVNKIT_HOME" ; pwd`
+JAVA_LIBS=/usr/share/java
+JAVA_HOME=/usr/lib/jvm/default-java
 
 cd "$old_wd"
 
-SVNKIT_CP="$SVNKIT_HOME/svnkit.jar":"$SVNKIT_HOME/svnkit-cli.jar":"$SVNKIT_HOME/trilead.jar":"$SVNKIT_HOME/jna.jar":"$SVNKIT_HOME/sqljet.%sqljet.version%.jar":"$SVNKIT_HOME/antlr-runtime-%antlr.version%.jar"
+SVNKIT_CP="$JAVA_LIBS/svnkit.jar":"$SVNKIT_HOME/svnkit-cli.jar":"$JAVA_LIBS/trilead-ssh2.jar":"$JAVA_LIBS/jna.jar":"$JAVA_LIBS/sqljet.jar":"$JAVA_LIBS/antlr3.jar"
 
 if $cygwin ; then
   SVNKIT_CP=`cygpath --windows --path "$SVNKIT_CP"`
diff --git a/svnkit-cli/scripts/jsvnversion b/svnkit-cli/scripts/jsvnversion
index f28171b..a8ba0d2 100644
--- a/svnkit-cli/scripts/jsvnversion
+++ b/svnkit-cli/scripts/jsvnversion
@@ -25,10 +25,12 @@ done
 
 SVNKIT_HOME=`dirname $prg`
 SVNKIT_HOME=`cd "$SVNKIT_HOME" ; pwd`
+JAVA_LIBS=/usr/share/java
+JAVA_HOME=/usr/lib/jvm/default-java
 
 cd "$old_wd"
 
-SVNKIT_CP="$SVNKIT_HOME/svnkit.jar":"$SVNKIT_HOME/svnkit-cli.jar":"$SVNKIT_HOME/trilead.jar":"$SVNKIT_HOME/jna.jar":"$SVNKIT_HOME/sqljet.%sqljet.version%.jar":"$SVNKIT_HOME/antlr-runtime-%antlr.version%.jar"
+SVNKIT_CP="$JAVA_LIBS/svnkit.jar":"$SVNKIT_HOME/svnkit-cli.jar":"$JAVA_LIBS/trilead-ssh2.jar":"$JAVA_LIBS/jna.jar":"$JAVA_LIBS/sqljet.jar":"$JAVA_LIBS/antlr3.jar"
 
 if $cygwin ; then
   SVNKIT_CP=`cygpath --windows --path "$SVNKIT_CP"`