CVS java-package/ibm-j2re1.5
Barry Hawkins
barryh-guest at haydn.debian.org
Sun Nov 6 20:12:19 UTC 2005
Update of /cvsroot/pkg-java/java-package/ibm-j2re1.5
In directory haydn:/tmp/cvs-serv1704/ibm-j2re1.5
Modified Files:
install remove
Log Message:
Cleanup of program_alternative() function in all its instances in install/remove scripts.
--- /cvsroot/pkg-java/java-package/ibm-j2re1.5/install 2005/11/04 22:42:06 1.2
+++ /cvsroot/pkg-java/java-package/ibm-j2re1.5/install 2005/11/06 20:12:18 1.3
@@ -1,6 +1,6 @@
suffix=j2re1.5-ibm
j2se_base="/usr/lib/$suffix"
-priority=314
+priority=315
if [ ! -e "$j2se_base/debian/info" ]; then
exit 0
@@ -9,14 +9,9 @@
# alternative <program>
function program_alternative() {
local program="$1"
- cat >/usr/bin/$program-$suffix <<EOF
-#! /bin/sh
-exec $j2se_base/jre/bin/$program \${1+"\$@"}
-EOF
- chmod 755 /usr/bin/$program-$suffix
update-alternatives \
--install "/usr/bin/$program" "$program" \
- "/usr/bin/$program-$suffix" "$priority"
+ "$j2se_base/bin/$program" "$priority"
}
program_alternative java
--- /cvsroot/pkg-java/java-package/ibm-j2re1.5/remove 2005/11/04 22:42:06 1.2
+++ /cvsroot/pkg-java/java-package/ibm-j2re1.5/remove 2005/11/06 20:12:18 1.3
@@ -9,8 +9,7 @@
function program_alternative() {
local program="$1"
update-alternatives \
- --remove "$program" "/usr/bin/$program-$suffix"
- rm "/usr/bin/$program-$suffix"
+ --remove "$program" "$j2se_base/bin/$program"
}
program_alternative java
More information about the pkg-java-commits
mailing list