Permalink
Browse files

Fixed download from edelivery.oracle.com, closes #13. Fixed rebuildin…

…g behaviour. Fixed apt sources format.
  • Loading branch information...
Martin Wimpress
Martin Wimpress committed Apr 17, 2012
1 parent 8eb4b46 commit abf7a178fa04b0654d416106c0a5873d6dc1151a
Showing with 15 additions and 9 deletions.
  1. +8 −1 CHANGES
  2. +7 −8 oab-java6.sh
View
@@ -2,6 +2,13 @@
History
=======
+0.2.0
+-----
+
+* Corrected the skip rebuilding behaviour so it works as described.
+* Corrected the format of ``apt`` source file.
+* Documentation is now self referencing.
+
0.1.9
-----
@@ -10,7 +17,7 @@ History
* Closes : https://github.com/flexiondotorg/oab-java6/issues/18
* Added an option (-s) to skip rebuilding if packages already exist, tanks to Derek Chen-Becker.
-* Added a comment to the apt source file, thanks to Eshwar Andhavarapu.
+* Added a comment to the ``apt`` source file, thanks to Eshwar Andhavarapu.
* Added documentation for user running the script behind a proxy server, thanks to Olzhas.
* Closes : https://github.com/flexiondotorg/oab-java6/issues/12
View
@@ -26,15 +26,14 @@ function copyright_msg() {
echo "* http://www.oracle.com/technetwork/java/javase/terms/license/"
echo
# Adjust the output if we are executing the script.
+ # It doesn't make sense to see this message here in the documentation.
if [ "${MODE}" != "build_docs" ]; then
echo "If you want to see what this is script is doing while it is running then execute"
- echo "the following from another shell:"
+ echo "the following from another shell:"
echo
echo " tail -f `pwd`/`basename ${0}`.log"
echo
- #else
- # echo " tail -f ./`basename ${0}`.log"
- fi
+ fi
}
function usage() {
@@ -57,7 +56,7 @@ function usage() {
echo "::"
echo
echo " cd ~/"
- echo " wget https://raw.github.com/flexiondotorg/oab-java6/master/`basename ${0}` -O `basename ${0}`"
+ echo " wget https://github.com/flexiondotorg/oab-java6/raw/${VER}/`basename ${0}` -O `basename ${0}`"
echo " chmod +x `basename ${0}`"
echo " sudo ./`basename ${0}`"
echo
@@ -73,8 +72,8 @@ function usage() {
echo "::"
echo
echo " tail -f ./`basename ${0}`.log"
- fi
- echo
+ echo
+ fi
echo "How it works"
echo "------------"
echo "This script is merely a wrapper for the most excellent Debian packaging"
@@ -195,7 +194,7 @@ check_ubuntu "all"
BUILD_KEY=""
BUILD_CLEAN=0
-SKIP_REBUILD=0
+SKIP_REBUILD=""
# Parse the options
OPTSTRING=bchk:s

0 comments on commit abf7a17

Please sign in to comment.