From d7459078f4530fe0110c5adee71e9efa5b9dd188 Mon Sep 17 00:00:00 2001
From: Ladios Jonquil <ladios.jonquil@gmail.com>
Date: Thu, 14 Jun 2012 00:16:28 +0800
Subject: [PATCH] Fix download link probing (#33, #34)

Update number is no longer part of the URL of the current release page.
This patch makes the script downloads the current release page first,
and then tries to find a matching version. If not found, then looks for
it in the archive page.
---
 oab-java.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/oab-java.sh b/oab-java.sh
index d9e5211..a673014 100755
--- a/oab-java.sh
+++ b/oab-java.sh
@@ -436,12 +436,12 @@ pid=$!;progress $pid
 
 # See if the Java version is on the download frontpage, otherwise look for it in
 # the previous releases page.
-DOWNLOAD_INDEX=`grep -P -o "/technetwork/java/javase/downloads/jdk-${JAVA_VER}u${JAVA_UPD}-downloads-\d+\.html" /tmp/oab-index.html | uniq`
-if [ -n "${DOWNLOAD_INDEX}" ]; then
-    ncecho " [x] Getting current release download page "
-    wget http://www.oracle.com/${DOWNLOAD_INDEX} -O /tmp/oab-download.html >> "$log" 2>&1 &
-    pid=$!;progress $pid
-else
+DOWNLOAD_INDEX=`grep -P -o "/technetwork/java/javase/downloads/jdk${JAVA_VER}-downloads-\d+\.html" /tmp/oab-index.html | uniq`
+ncecho " [x] Getting current release download page "
+wget http://www.oracle.com/${DOWNLOAD_INDEX} -O /tmp/oab-download.html >> "$log" 2>&1 &
+pid=$!;progress $pid
+DOWNLOAD_FOUND=`grep "jdk-${JAVA_VER}u${JAVA_UPD}-linux-i586\." /tmp/oab-download.html`
+if [ -z "${DOWNLOAD_FOUND}" ]; then
     ncecho " [x] Getting previous releases download page "
     if [ "${JAVA_UPSTREAM}" == "sun-java6" ]; then
         wget http://www.oracle.com/technetwork/java/javasebusiness/downloads/java-archive-downloads-javase6-419409.html -O /tmp/oab-download.html >> "$log" 2>&1 &