[Lunar-commits] CVS: moonbase/compilers/j2sdk BUILD, 1.3, 1.4 DETAILS, 1.3, 1.4 PRE_BUILD, 1.4, 1.5 POST_INSTALL, 1.1, NONE

[Jerry Lundström]

Update of /var/cvs/lunar/moonbase/compilers/j2sdk
In directory dbguin.lunar-linux.org:/tmp/cvs-serv18962

Modified Files:
	BUILD DETAILS PRE_BUILD 
Removed Files:
	POST_INSTALL 
Log Message:
added md5sum, reworked the krb thing, now it wont link /usr/bin program if they already exist. added more checks on mozilla plugin, is this plugin really needed???, clean pre_build some too

Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/compilers/j2sdk/BUILD,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- BUILD	22 Feb 2003 06:16:17 -0000	1.3
+++ BUILD	18 Aug 2004 09:43:55 -0000	1.4
@@ -1,15 +1,14 @@
 (
-
-  prepare_install                       &&
-  cp   -r  $SOURCE_DIRECTORY  /usr/lib  &&
-  cd  /usr/lib/$MODULE$VERSION/bin     &&
-  for  FILE  in  `ls`;  do
-    if  [  -f  $FILE  ];  then
-      ln  -sf  /usr/lib/$MODULE$VERSION/bin/$FILE  /usr/bin
+  prepare_install &&
+  cp -r $SOURCE_DIRECTORY /usr/lib &&
+  for FILE in `/bin/ls /usr/lib/$MODULE$VERSION/bin`; do
+    if [ -f "/usr/lib/$MODULE$VERSION/bin/$FILE" -a ! -e "/usr/bin/$FILE" ]; then
+      ln -s "/usr/lib/$MODULE$VERSION/bin/$FILE" "/usr/bin/$FILE"
     fi
-  done &&
-  if module_installed mozilla; then
-    ln -sf /usr/lib/$MODULE$VERSION/jre/plugin/i386/mozilla/javaplugin_oji.so /usr/lib/mozilla/plugins/
-  fi
+  done
 
+  if module_installed mozilla &&
+     [ -d "/usr/lib/mozilla/plugins" -a ! -e "/usr/lib/mozilla/plugins/javaplugin_oji.so" ]; then
+    ln -s /usr/lib/$MODULE$VERSION/jre/plugin/i386/mozilla/javaplugin_oji.so /usr/lib/mozilla/plugins/
+  fi
 ) > $C_FIFO 2>&1

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/compilers/j2sdk/DETAILS,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- DETAILS	22 Feb 2003 06:16:17 -0000	1.3
+++ DETAILS	18 Aug 2004 09:43:55 -0000	1.4
@@ -5,6 +5,7 @@
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE$VERSION
    SOURCE_URL[0]=ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/JDK-$VERSION/i386/$SUBVERSION/$SOURCE
    SOURCE_URL[1]=ftp://sunsite.dk/mirrors/java-linux/JDK-$VERSION/i386/$SUBVERSION/$SOURCE
+      SOURCE_VFY=md5:a0c7838233603fccb30641998195e8bc
         WEB_SITE=http://www.blackdown.org/java-linux/java2-status
          ENTERED=20010922
          UPDATED=20030222

Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/compilers/j2sdk/PRE_BUILD,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- PRE_BUILD	23 Oct 2003 13:30:59 -0000	1.4
+++ PRE_BUILD	18 Aug 2004 09:43:55 -0000	1.5
@@ -1,15 +1,10 @@
 cd $BUILD_DIRECTORY &&
 chmod +x $SOURCE_CACHE/$SOURCE &&
 $SOURCE_CACHE/$SOURCE
-if [ $? -eq 3 ]; then
-  cd $SOURCE_DIRECTORY &&
-  chown -R root:root .
-else
+
+if [ $? -ne 3 ]; then
   echo 'Problem with either License Agreement or j2sdk binary'
   exit 1
 fi
-if [ -x /usr/bin/kinit ] || [ -x /usr/bin/klist ] ; then
-  rm -rf /tmp/krbsave
-  mkdir /tmp/krbsave
-  mv -f /usr/bin/kinit /usr/bin/klist /tmp/krbsave
-fi
+
+chown -R root:root $SOURCE_DIRECTORY

--- POST_INSTALL DELETED ---