diff --git a/sahara_plugin_mapr/plugins/mapr/resources/images/common/configure_extjs b/sahara_plugin_mapr/plugins/mapr/resources/images/common/configure_extjs index 976d207..0f67716 100644 --- a/sahara_plugin_mapr/plugins/mapr/resources/images/common/configure_extjs +++ b/sahara_plugin_mapr/plugins/mapr/resources/images/common/configure_extjs @@ -8,7 +8,7 @@ extjs_basepath=$(basename ${EXTJS_DOWNLOAD_URL}) extjs_archive=/tmp/${extjs_basepath} extjs_folder="${extjs_basepath%.*}" -function setup_extjs { +setup_extjs() { curl -sS -o $extjs_archive $EXTJS_DOWNLOAD_URL mkdir -p $EXTJS_DESTINATION_DIR } diff --git a/sahara_plugin_mapr/plugins/mapr/resources/images/image.yaml b/sahara_plugin_mapr/plugins/mapr/resources/images/image.yaml index 7292b3d..3b754f8 100644 --- a/sahara_plugin_mapr/plugins/mapr/resources/images/image.yaml +++ b/sahara_plugin_mapr/plugins/mapr/resources/images/image.yaml @@ -150,7 +150,6 @@ validators: - mysql-common - nfs-common - open-iscsi - - openjdk-7-jre - syslinux-common - zlib1g-dev - script: common/configure_extjs diff --git a/sahara_plugin_mapr/plugins/mapr/resources/images/ubuntu/install_openjdk b/sahara_plugin_mapr/plugins/mapr/resources/images/ubuntu/install_openjdk index 750c2e8..777f0b4 100644 --- a/sahara_plugin_mapr/plugins/mapr/resources/images/ubuntu/install_openjdk +++ b/sahara_plugin_mapr/plugins/mapr/resources/images/ubuntu/install_openjdk @@ -4,12 +4,6 @@ echo "Installing OpenJDK" if [ $test_only -eq 0 ]; then apt-get install -y openjdk-7-jdk - - JRE_PATH=$(update-alternatives --list java) - JRE_HOME=${JRE_PATH%/bin/java} - JDK_PATH=$(update-alternatives --list javac) - JDK_HOME=${JDK_PATH%/bin/javac} - echo "OpenJDK has been installed" else exit 0