Skip to content
This repository has been archived by the owner on Apr 9, 2019. It is now read-only.

Commit

Permalink
Closes issue #1. Closes issue #2.
Browse files Browse the repository at this point in the history
  • Loading branch information
flexiondotorg committed Jan 17, 2012
1 parent 3b6f4db commit a342387
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 3 deletions.
5 changes: 5 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 10 additions & 3 deletions oab-java6.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit a342387

Please sign in to comment.