[Lunar-commits] <moonbase> sun-*: cleanup PRE_BUILD as much as possible... checksum is still missing

[Michael 'v4hn' Goerner]

commit 4acc7cefced3786a36ea79934656734745b465b9
Author: Michael 'v4hn' Goerner <v4hn at lunar-linux.org>
Date:   Sat May 5 23:32:39 2012 +0200

    sun-*: cleanup PRE_BUILD as much as possible... checksum is still missing
---
 compilers/sun-jdk/PRE_BUILD |   34 ++++++++++++++++++++++------------
 compilers/sun-jre/PRE_BUILD |   34 ++++++++++++++++++++++------------
 2 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/compilers/sun-jdk/PRE_BUILD b/compilers/sun-jdk/PRE_BUILD
index d5306b9..850cb82 100644
--- a/compilers/sun-jdk/PRE_BUILD
+++ b/compilers/sun-jdk/PRE_BUILD
@@ -1,14 +1,24 @@
-CURDIR=`pwd`
-cd $SOURCE_CACHE
+CURDIR="`pwd`" &&
+cd $SOURCE_CACHE &&
+
 if [ "$(arch)" == "x86_64" ]; then
-bits=x64
+   bits=x64
 else
-bits=i586
-fi
-wget -c --header "Cookie: gpw_e24=a" http://download.oracle.com/otn-pub/java/jdk/7u4-b20/jdk-7u4-linux-$bits.tar.gz
-wget -c --header "Cookie: gpw_e24=a" http://download.oracle.com/otn-pub/java/jce/7/UnlimitedJCEPolicyJDK7.zip
-cd $BUILD_DIRECTORY
-tar -xzpvf $SOURCE_CACHE/jdk-7u4-linux-$bits.tar.gz
-cd $SOURCE_DIRECTORY/jre/lib/security
-unzip $SOURCE_CACHE/UnlimitedJCEPolicyJDK7.zip
-cd $CURDIR
+   bits=i586
+fi &&
+
+JDK_ARCHIVE=jdk-${VERSION}-linux-$bits.tar.gz &&
+JDK_POLICY=UnlimitedJCEPolicyJDK7.zip &&
+
+wget -c --header "Cookie: gpw_e24=a" http://download.oracle.com/otn-pub/java/jdk/${FVERSION}/${JDK_ARCHIVE} &&
+wget -c --header "Cookie: gpw_e24=a" http://download.oracle.com/otn-pub/java/jce/7/${JDK_POLICY} &&
+
+cd $BUILD_DIRECTORY &&
+
+tar -xzpvf $SOURCE_CACHE/${JDK_ARCHIVE} &&
+
+cd $SOURCE_DIRECTORY/jre/lib/security &&
+
+unzip $SOURCE_CACHE/${JDK_POLICY} &&
+
+cd "$CURDIR"
diff --git a/compilers/sun-jre/PRE_BUILD b/compilers/sun-jre/PRE_BUILD
index 767349e..4d126e0 100644
--- a/compilers/sun-jre/PRE_BUILD
+++ b/compilers/sun-jre/PRE_BUILD
@@ -1,14 +1,24 @@
-CURDIR=`pwd`
-cd $SOURCE_CACHE
+CURDIR="`pwd`" &&
+cd $SOURCE_CACHE &&
+
 if [ "$(arch)" == "x86_64" ]; then
-bits=x64
+   bits=x64
 else
-bits=i586
-fi
-wget -c --header "Cookie: gpw_e24=a" http://download.oracle.com/otn-pub/java/jdk/7u4-b20/jre-7u4-linux-$bits.tar.gz
-wget -c --header "Cookie: gpw_e24=a" http://download.oracle.com/otn-pub/java/jce/7/UnlimitedJCEPolicyJDK7.zip
-cd $BUILD_DIRECTORY
-tar -xzpvf $SOURCE_CACHE/jre-7u4-linux-$bits.tar.gz
-cd $SOURCE_DIRECTORY/lib/security
-unzip $SOURCE_CACHE/UnlimitedJCEPolicyJDK7.zip
-cd $CURDIR
+   bits=i586
+fi &&
+
+JRE_ARCHIVE=jre-${VERSION}-linux-$bits.tar.gz &&
+JCE_POLICY=UnlimitedJCEPolicyJDK7.zip &&
+
+wget -c --header "Cookie: gpw_e24=a" http://download.oracle.com/otn-pub/java/jdk/${FVERSION}/${JRE_ARCHIVE} &&
+wget -c --header "Cookie: gpw_e24=a" http://download.oracle.com/otn-pub/java/jce/7/${JCE_POLICY} &&
+
+cd $BUILD_DIRECTORY &&
+
+tar -xzpvf $SOURCE_CACHE/${JRE_ARCHIVE} &&
+
+cd $SOURCE_DIRECTORY/lib/security &&
+
+unzip $SOURCE_CACHE/${JCE_POLICY} &&
+
+cd "$CURDIR"