CVS java-package/lib

Barry Hawkins barryh-guest@haydn.debian.org
Mon Mar 14 01:59:17 2005


Update of /cvsroot/pkg-java/java-package/lib
In directory haydn:/tmp/cvs-serv14564/lib

Modified Files:
	blackdown-j2re.sh blackdown-j2sdk.sh common.sh 
Added Files:
	ibm-j2re.sh ibm-j2sdk.sh 
Log Message:
Enabled IBM JRE/JDK support.
Enabled Blackdown JRE/JDK support for PowerPC.


--- /cvsroot/pkg-java/java-package/lib/blackdown-j2re.sh	2005/01/24 23:07:44	1.5
+++ /cvsroot/pkg-java/java-package/lib/blackdown-j2re.sh	2005/03/14 08:58:42	1.6
@@ -80,6 +80,15 @@
 	    ;;
       esac
       ;;
+    "powerpc-linux")
+      case "$archive_name" in
+	"j2re-1.3.1-14-FCS-linux-ppc.bin") # SUPPORTED
+	    j2se_version=1.3.1-14
+	    j2se_expected_min_size=28
+	    found=true
+	    ;;
+      esac
+      ;;
   esac
   if [[ -n "$found" ]]; then
 	cat << EOF
--- /cvsroot/pkg-java/java-package/lib/blackdown-j2sdk.sh	2005/01/24 23:07:44	1.5
+++ /cvsroot/pkg-java/java-package/lib/blackdown-j2sdk.sh	2005/03/14 08:58:42	1.6
@@ -80,6 +80,15 @@
 	    ;;
       esac
       ;;
+    "powerpc-linux")
+      case "$archive_name" in
+        "j2sdk-1.3.1-14-FCS-linux-ppc.bin") # SUPPORTED
+            j2se_version=1.3.1-14
+            j2se_expected_min_size=44
+            found=true
+            ;;
+      esac
+      ;;
   esac
   if [[ -n "$found" ]]; then
     cat << EOF
--- /cvsroot/pkg-java/java-package/lib/common.sh	2005/02/08 14:13:52	1.7
+++ /cvsroot/pkg-java/java-package/lib/common.sh	2005/03/14 08:58:42	1.8
@@ -69,8 +69,20 @@
     mkdir "$extract_dir"
     cd "$extract_dir"
     echo
-    
-    if ! sh "$archive_path"; then
+
+    local extract_cmd
+    case "$archive_path" in
+	*.tar)
+	    extract_cmd="tar xf";;
+	*.tar.bz2)
+	    extract_cmd="tar --bzip2 -xf";;
+	*.tgz|*.tar.gz)
+	    extract_cmd="tar xfz";;
+	*)
+	    extract_cmd=sh
+    esac
+
+    if ! $extract_cmd "$archive_path"; then
 	cat << EOF
 
 WARNING: The package installation script exited with an error