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

Update for 6u33, and dependency of JCE from java-sun6 #36

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions oab-java.sh
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ if [ -n "${DOWNLOAD_INDEX}" ]; then
else
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 &
wget http://www.oracle.com/technetwork/java/javase/downloads/jdk6-downloads-1637591.html -O /tmp/oab-download.html >> "$log" 2>&1 &
else
wget http://www.oracle.com/technetwork/java/javasebusiness/downloads/java-archive-downloads-javase7-521261.html -O /tmp/oab-download.html >> "$log" 2>&1 &
fi
Expand All @@ -461,11 +461,10 @@ fi
for JAVA_BIN in ${JAVA_BINS}
do
# Get the download URL and size
DOWNLOAD_URL=`grep ${JAVA_BIN} /tmp/oab-download.html | cut -d'{' -f2 | cut -d',' -f3 | cut -d'"' -f4`
DOWNLOAD_URL=`grep ${JAVA_BIN} /tmp/oab-download.html | cut -d'"' -f12`
DOWNLOAD_SIZE=`grep ${JAVA_BIN} /tmp/oab-download.html | cut -d'{' -f2 | cut -d',' -f2 | cut -d':' -f2 | sed 's/"//g'`
# Cookies required for download
COOKIES="oraclelicensejdk-${JAVA_VER}u${JAVA_UPD}-oth-JPR=accept-securebackup-cookie;gpw_e24=http://edelivery.oracle.com"

ncecho " [x] Downloading ${JAVA_BIN} : ${DOWNLOAD_SIZE} "
wget --no-check-certificate --header="Cookie: ${COOKIES}" -c "${DOWNLOAD_URL}" -O ${WORK_PATH}/pkg/${JAVA_BIN} >> "$log" 2>&1 &
pid=$!;progress_loop $pid
Expand All @@ -475,6 +474,10 @@ do
pid=$!;progress_loop $pid
done

# Download the SCE
SCE_URL="http://download.oracle.com/otn-pub/java/jce_policy/6/jce_policy-6.zip"
wget --no-check-certificate --header="Cookie: ${COOKIES}" -c "${SCE_URL}" -O ${WORK_PATH}/pkg/jce_policy-6.zip >> "$log" 2>&1 &

# Determine the new version
NEW_VERSION="${DEB_VERSION}~${LSB_CODE}1"

Expand All @@ -487,6 +490,9 @@ fi
# Genereate a build message
BUILD_MESSAGE="Automated build for ${LSB_REL} using https://github.com/rraptorr/${JAVA_UPSTREAM}"

# copy over the jce?
cp ${WORK_PATH}/pkg/*.zip ${WORK_PATH}/src/

# Change directory to the build directory
cd ${WORK_PATH}/src

Expand Down