[Lunar-commits] <moonbase> sun-{jdk, jre}: remove old java during install

[Zbigniew Luszpinski]

commit 902e1ed856b8eff57444ab53401cce2d61667fc2
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Sat Feb 14 17:03:10 2009 +0100

    sun-{jdk,jre}: remove old java during install
---
 compilers/sun-jdk/BUILD       |    3 +++
 compilers/sun-jdk/POST_REMOVE |    2 +-
 compilers/sun-jre/BUILD       |    3 +++
 compilers/sun-jre/POST_REMOVE |    2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/compilers/sun-jdk/BUILD b/compilers/sun-jdk/BUILD
index b676b61..ff28021 100644
--- a/compilers/sun-jdk/BUILD
+++ b/compilers/sun-jdk/BUILD
@@ -2,6 +2,9 @@
   chmod +x $SOURCE &&
   ./$SOURCE --accept-license --unpack &&
 
+  # Clean up old java 1.6.0 service packs
+  rm -rf /usr/lib/jdk1.6.0_* &&
+
   prepare_install &&
 
   cp -r $SOURCE_DIRECTORY/jdk${VERSION} /usr/lib/ &&
diff --git a/compilers/sun-jdk/POST_REMOVE b/compilers/sun-jdk/POST_REMOVE
index 8c37382..c81210a 100644
--- a/compilers/sun-jdk/POST_REMOVE
+++ b/compilers/sun-jdk/POST_REMOVE
@@ -1 +1 @@
-rm -rf /usr/lib/jdk${VERSION}_*
+rm -rf /usr/lib/jdk1.6.0_*
diff --git a/compilers/sun-jre/BUILD b/compilers/sun-jre/BUILD
index f976b41..a408b28 100644
--- a/compilers/sun-jre/BUILD
+++ b/compilers/sun-jre/BUILD
@@ -2,6 +2,9 @@
   chmod +x $SOURCE &&
   ./$SOURCE --accept-license --unpack &&
 
+  # Clean up old java 1.6.0 service packs
+  rm -rf /usr/lib/jre1.6.0_* &&
+
   prepare_install  &&
 
   cp -r $SOURCE_DIRECTORY/jre${VERSION} /usr/lib/ &&
diff --git a/compilers/sun-jre/POST_REMOVE b/compilers/sun-jre/POST_REMOVE
index fa18104..35eb536 100644
--- a/compilers/sun-jre/POST_REMOVE
+++ b/compilers/sun-jre/POST_REMOVE
@@ -1 +1 @@
-rm -rf /usr/lib/jre${VERSION}_*
+rm -rf /usr/lib/jre1.6.0_*