Skip to content
Browse files

Closes issue #1. Closes issue #2.

  • Loading branch information...
1 parent 3b6f4db commit a34238777dc4a0dac637d3ba3ee2b7e36fa2883f @flexiondotorg committed Jan 17, 2012
Showing with 20 additions and 3 deletions.
  1. +5 −0 CHANGES
  2. +5 −0 README
  3. +10 −3 oab-java6.sh
View
5 CHANGES
@@ -5,6 +5,11 @@ History
0.1.3
-----
+* Added checking out of tagged releases of the upstream scripts.
+ - Closes : https://github.com/flexiondotorg/oab-java6/issues/1
+* Added loose distribution checking so it should now work with Linux Mint and
+ other Ubuntu derivatives.
+ - Closes : https://github.com/flexiondotorg/oab-java6/issues/2
* Added the creation of a local 'apt' repository
* Removed installation of Java packages, you can now use 'apt-get' yourself
* Updated documentation
View
5 README
@@ -77,6 +77,11 @@ History
0.1.3
-----
+* Added checking out of tagged releases of the upstream scripts.
+ - Closes : https://github.com/flexiondotorg/oab-java6/issues/1
+* Added loose distribution checking so it should now work with Linux Mint and
+ other Ubuntu derivatives.
+ - Closes : https://github.com/flexiondotorg/oab-java6/issues/2
* Added the creation of a local 'apt' repository
* Removed installation of Java packages, you can now use 'apt-get' yourself
* Updated documentation
View
13 oab-java6.sh
@@ -174,8 +174,7 @@ fi
# Check we are running on a supported system in the correct way.
check_root
check_sudo
-check_ubuntu "lucid maverick natty oneiric precise"
-lsb
+check_ubuntu "all"
# Parse the options
OPTSTRING=bh
@@ -220,12 +219,20 @@ ncecho " [x] Removing clones of https://github.com/rraptorr/sun-java6 "
rm -rfv /var/local/oab/sun-java6*-${JAVA_VER}.${JAVA_UPD} 2>/dev/null >> "$log" 2>&1 &
pid=$!;progress $pid
-# Checkout the code
+# Clone the code
ncecho " [x] Cloning https://github.com/rraptorr/sun-java6 "
cd /var/local/oab/ >> "$log" 2>&1
git clone git://github.com/rraptorr/sun-java6.git sun-java6-${JAVA_VER}.${JAVA_UPD} >> "$log" 2>&1 &
pid=$!;progress $pid
+# Checkout the latest tagged release
+cd /var/local/oab/sun-java6-${JAVA_VER}.${JAVA_UPD} >> "$log" 2>&1
+TAG=`git tag -l v${JAVA_VER}.${JAVA_UPD}-* | tail -n1`
+
+ncecho " [x] Checking out ${TAG} "
+git checkout ${TAG} >> "$log" 2>&1 &
+pid=$!;progress $pid
+
# Download the Oracle install packages.
for JAVA_PLAT in i586 x64
do

0 comments on commit a342387

Please sign in to comment.
Something went wrong with that request. Please try again.