CVS java-package/blackdown-j2re1.4

[Barry Hawkins]

Update of /cvsroot/pkg-java/java-package/blackdown-j2re1.4
In directory haydn:/tmp/cvs-serv1704/blackdown-j2re1.4

Modified Files:
	install remove 
Log Message:
Cleanup of program_alternative() function in all its instances in install/remove scripts.

--- /cvsroot/pkg-java/java-package/blackdown-j2re1.4/install	2005/04/06 04:14:57	1.4
+++ /cvsroot/pkg-java/java-package/blackdown-j2re1.4/install	2005/11/06 20:12:12	1.5
@@ -1,12 +1,9 @@
-j2se_base="/usr/lib/j2re1.4-blackdown"
-
-# due to prior brokenness
+suffix=j2re1.4-blackdown
+j2se_base="/usr/lib/$suffix"
 priority=314
 
 if [ ! -e "$j2se_base/debian/info" ]; then
     exit 0
-else
-	. "$j2se_base/debian/info"
 fi
 
 # alternative <program>
--- /cvsroot/pkg-java/java-package/blackdown-j2re1.4/remove	2005/04/06 04:14:57	1.3
+++ /cvsroot/pkg-java/java-package/blackdown-j2re1.4/remove	2005/11/06 20:12:13	1.4
@@ -1,9 +1,8 @@
-j2se_base="/usr/lib/j2re1.4-blackdown"
+suffix=j2re1.4-blackdown
+j2se_base="/usr/lib/$suffix"
 
 if [ ! -e "$j2se_base/debian/info" ]; then
     exit 0
-else
-	. "$j2se_base/debian/info"
 fi
 
 # alternative <program>