diff --git a/src/.config b/src/.config index 301bf0397..e79fbd328 100644 --- a/src/.config +++ b/src/.config @@ -41,12 +41,6 @@ SYSLINUX_SOURCE_URL=http://kernel.org/pub/linux/utils/boot/syslinux/syslinux-6.0 # # ##################################################################### -# You can find the latest Open JDK archives here: -# -# http://jdk.java.net/9 -# -OPENJDK_URL=http://download.java.net/java/GA/jdk9/9.0.1/binaries/openjdk-9.0.1_linux-x64_bin.tar.gz - # You can find the latest static-get shell script here: # # http://s.minos.io/s diff --git a/src/minimal_overlay/bundles/openjdk/.config b/src/minimal_overlay/bundles/openjdk/.config new file mode 100644 index 000000000..1602e14d4 --- /dev/null +++ b/src/minimal_overlay/bundles/openjdk/.config @@ -0,0 +1,5 @@ +# You can find the latest Open JDK archives here: +# +# http://jdk.java.net/9 +# +OPENJDK_URL=http://download.java.net/java/GA/jdk9/9.0.1/binaries/openjdk-9.0.1_linux-x64_bin.tar.gz diff --git a/src/minimal_overlay/bundles/openjdk/01_get.sh b/src/minimal_overlay/bundles/openjdk/01_get.sh index 1b3a25ee8..c7d3de016 100755 --- a/src/minimal_overlay/bundles/openjdk/01_get.sh +++ b/src/minimal_overlay/bundles/openjdk/01_get.sh @@ -4,15 +4,13 @@ set -e . ../../common.sh -# Grab everything after the '=' character. -DOWNLOAD_URL=$(grep -i OPENJDK_URL $MAIN_SRC_DIR/.config | cut -f2 -d'=') +# Read the common configuration properties. +DOWNLOAD_URL=`read_property OPENJDK_URL` +USE_LOCAL_SOURCE=`read_property USE_LOCAL_SOURCE` # Grab everything after the last '/' character. ARCHIVE_FILE=${DOWNLOAD_URL##*/} -# Read the 'USE_LOCAL_SOURCE' property from '.config' -USE_LOCAL_SOURCE="$(grep -i USE_LOCAL_SOURCE $MAIN_SRC_DIR/.config | cut -f2 -d'=')" - if [ "$USE_LOCAL_SOURCE" = "true" -a ! -f $MAIN_SRC_DIR/source/overlay/$ARCHIVE_FILE ] ; then echo "Bundle $MAIN_SRC_DIR/source/overlay/$ARCHIVE_FILE is missing and will be downloaded." USE_LOCAL_SOURCE="false"