diff --git a/sahara/plugins/ambari/resources/images/centos/unlimited_security_artifacts b/sahara/plugins/ambari/resources/images/centos/unlimited_security_artifacts index 78f80cc865..bd2e0a778c 100644 --- a/sahara/plugins/ambari/resources/images/centos/unlimited_security_artifacts +++ b/sahara/plugins/ambari/resources/images/centos/unlimited_security_artifacts @@ -3,8 +3,8 @@ if [ ! -d /tmp/UnlimitedPolicy/ ]; then if [ $test_only -eq 0 ]; then mkdir /tmp/UnlimitedPolicy/ - wget https://tarballs.openstack.org/sahara-extra/dist/common-artifacts/local_policy.jar -O /tmp/UnlimitedPolicy/local_policy.jar - wget https://tarballs.openstack.org/sahara-extra/dist/common-artifacts/US_export_policy.jar -O /tmp/UnlimitedPolicy/US_export_policy.jar + curl -sS https://tarballs.openstack.org/sahara-extra/dist/common-artifacts/local_policy.jar -o /tmp/UnlimitedPolicy/local_policy.jar + curl -sS https://tarballs.openstack.org/sahara-extra/dist/common-artifacts/US_export_policy.jar -o /tmp/UnlimitedPolicy/US_export_policy.jar else exit 0 fi diff --git a/sahara/plugins/ambari/resources/images/common/add_jar b/sahara/plugins/ambari/resources/images/common/add_jar index 0360cd68a5..5727a97c83 100644 --- a/sahara/plugins/ambari/resources/images/common/add_jar +++ b/sahara/plugins/ambari/resources/images/common/add_jar @@ -10,9 +10,9 @@ HADOOP_SWIFT_JAR_NAME=hadoop-openstack.jar if [ ! -f $HDFS_LIB_DIR/$HADOOP_SWIFT_JAR_NAME ]; then if [ $test_only -eq 0 ]; then if [ -z "${swift_url:-}" ]; then - wget -O $HDFS_LIB_DIR/$HADOOP_SWIFT_JAR_NAME $SWIFT_LIB_URI + curl -sS -o $HDFS_LIB_DIR/$HADOOP_SWIFT_JAR_NAME $SWIFT_LIB_URI else - wget -O $HDFS_LIB_DIR/$HADOOP_SWIFT_JAR_NAME $swift_url + curl -sS -o $HDFS_LIB_DIR/$HADOOP_SWIFT_JAR_NAME $swift_url fi if [ $? -ne 0 ]; then diff --git a/sahara/plugins/cdh/v5_11_0/resources/images/common/add_jar b/sahara/plugins/cdh/v5_11_0/resources/images/common/add_jar index 4a1b57e210..1e98b7f100 100644 --- a/sahara/plugins/cdh/v5_11_0/resources/images/common/add_jar +++ b/sahara/plugins/cdh/v5_11_0/resources/images/common/add_jar @@ -9,7 +9,7 @@ SWIFT_LIB_URI="$HADOOP_SWIFT_BUILD_LOCATION/hadoop-openstack-${hadoop}.jar" HADOOP_SWIFT_JAR_NAME="hadoop-openstack.jar" if [ $test_only -eq 0 ]; then - wget -O $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME $SWIFT_LIB_URI + curl -sS -o $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME $SWIFT_LIB_URI if [ $? -ne 0 ]; then printf "Could not download Swift Hadoop FS implementation.\nAborting\n" diff --git a/sahara/plugins/cdh/v5_11_0/resources/images/common/install_extjs b/sahara/plugins/cdh/v5_11_0/resources/images/common/install_extjs index 39a63cd8d2..6b255f1d8f 100644 --- a/sahara/plugins/cdh/v5_11_0/resources/images/common/install_extjs +++ b/sahara/plugins/cdh/v5_11_0/resources/images/common/install_extjs @@ -8,7 +8,7 @@ extjs_archive=/tmp/${extjs_basepath} extjs_folder="${extjs_basepath%.*}" setup_extjs() { - wget -O $extjs_archive $EXTJS_DOWNLOAD_URL + curl -sS -o $extjs_archive $EXTJS_DOWNLOAD_URL mkdir -p $EXTJS_DESTINATION_DIR } diff --git a/sahara/plugins/cdh/v5_11_0/resources/images/common/unlimited_security_artifacts b/sahara/plugins/cdh/v5_11_0/resources/images/common/unlimited_security_artifacts index 5df39005c7..59dc11d642 100644 --- a/sahara/plugins/cdh/v5_11_0/resources/images/common/unlimited_security_artifacts +++ b/sahara/plugins/cdh/v5_11_0/resources/images/common/unlimited_security_artifacts @@ -3,8 +3,8 @@ if [ ! -n /tmp/UnlimitedPolicy/ ]; then if [ $test_only -eq 0 ]; then mkdir /tmp/UnlimitedPolicy/ - wget $unlimited_security_location/local_policy.jar -O /tmp/UnlimitedPolicy/local_policy.jar - wget $unlimited_security_location/US_export_policy.jar -O /tmp/UnlimitedPolicy/US_export_policy.jar + curl -sS $unlimited_security_location/local_policy.jar -o /tmp/UnlimitedPolicy/local_policy.jar + curl -sS $unlimited_security_location/US_export_policy.jar -o /tmp/UnlimitedPolicy/US_export_policy.jar else exit 0 fi diff --git a/sahara/plugins/cdh/v5_13_0/resources/images/common/add_jar b/sahara/plugins/cdh/v5_13_0/resources/images/common/add_jar index 4a1b57e210..1e98b7f100 100644 --- a/sahara/plugins/cdh/v5_13_0/resources/images/common/add_jar +++ b/sahara/plugins/cdh/v5_13_0/resources/images/common/add_jar @@ -9,7 +9,7 @@ SWIFT_LIB_URI="$HADOOP_SWIFT_BUILD_LOCATION/hadoop-openstack-${hadoop}.jar" HADOOP_SWIFT_JAR_NAME="hadoop-openstack.jar" if [ $test_only -eq 0 ]; then - wget -O $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME $SWIFT_LIB_URI + curl -sS -o $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME $SWIFT_LIB_URI if [ $? -ne 0 ]; then printf "Could not download Swift Hadoop FS implementation.\nAborting\n" diff --git a/sahara/plugins/cdh/v5_13_0/resources/images/common/install_extjs b/sahara/plugins/cdh/v5_13_0/resources/images/common/install_extjs index 39a63cd8d2..6b255f1d8f 100644 --- a/sahara/plugins/cdh/v5_13_0/resources/images/common/install_extjs +++ b/sahara/plugins/cdh/v5_13_0/resources/images/common/install_extjs @@ -8,7 +8,7 @@ extjs_archive=/tmp/${extjs_basepath} extjs_folder="${extjs_basepath%.*}" setup_extjs() { - wget -O $extjs_archive $EXTJS_DOWNLOAD_URL + curl -sS -o $extjs_archive $EXTJS_DOWNLOAD_URL mkdir -p $EXTJS_DESTINATION_DIR } diff --git a/sahara/plugins/cdh/v5_13_0/resources/images/common/unlimited_security_artifacts b/sahara/plugins/cdh/v5_13_0/resources/images/common/unlimited_security_artifacts index 5df39005c7..59dc11d642 100644 --- a/sahara/plugins/cdh/v5_13_0/resources/images/common/unlimited_security_artifacts +++ b/sahara/plugins/cdh/v5_13_0/resources/images/common/unlimited_security_artifacts @@ -3,8 +3,8 @@ if [ ! -n /tmp/UnlimitedPolicy/ ]; then if [ $test_only -eq 0 ]; then mkdir /tmp/UnlimitedPolicy/ - wget $unlimited_security_location/local_policy.jar -O /tmp/UnlimitedPolicy/local_policy.jar - wget $unlimited_security_location/US_export_policy.jar -O /tmp/UnlimitedPolicy/US_export_policy.jar + curl -sS $unlimited_security_location/local_policy.jar -o /tmp/UnlimitedPolicy/local_policy.jar + curl -sS $unlimited_security_location/US_export_policy.jar -o /tmp/UnlimitedPolicy/US_export_policy.jar else exit 0 fi diff --git a/sahara/plugins/cdh/v5_7_0/resources/images/common/add_jar b/sahara/plugins/cdh/v5_7_0/resources/images/common/add_jar index 4a1b57e210..1e98b7f100 100644 --- a/sahara/plugins/cdh/v5_7_0/resources/images/common/add_jar +++ b/sahara/plugins/cdh/v5_7_0/resources/images/common/add_jar @@ -9,7 +9,7 @@ SWIFT_LIB_URI="$HADOOP_SWIFT_BUILD_LOCATION/hadoop-openstack-${hadoop}.jar" HADOOP_SWIFT_JAR_NAME="hadoop-openstack.jar" if [ $test_only -eq 0 ]; then - wget -O $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME $SWIFT_LIB_URI + curl -sS -o $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME $SWIFT_LIB_URI if [ $? -ne 0 ]; then printf "Could not download Swift Hadoop FS implementation.\nAborting\n" diff --git a/sahara/plugins/cdh/v5_7_0/resources/images/common/install_extjs b/sahara/plugins/cdh/v5_7_0/resources/images/common/install_extjs index 39a63cd8d2..6b255f1d8f 100644 --- a/sahara/plugins/cdh/v5_7_0/resources/images/common/install_extjs +++ b/sahara/plugins/cdh/v5_7_0/resources/images/common/install_extjs @@ -8,7 +8,7 @@ extjs_archive=/tmp/${extjs_basepath} extjs_folder="${extjs_basepath%.*}" setup_extjs() { - wget -O $extjs_archive $EXTJS_DOWNLOAD_URL + curl -sS -o $extjs_archive $EXTJS_DOWNLOAD_URL mkdir -p $EXTJS_DESTINATION_DIR } diff --git a/sahara/plugins/cdh/v5_7_0/resources/images/common/unlimited_security_artifacts b/sahara/plugins/cdh/v5_7_0/resources/images/common/unlimited_security_artifacts index 5df39005c7..59dc11d642 100644 --- a/sahara/plugins/cdh/v5_7_0/resources/images/common/unlimited_security_artifacts +++ b/sahara/plugins/cdh/v5_7_0/resources/images/common/unlimited_security_artifacts @@ -3,8 +3,8 @@ if [ ! -n /tmp/UnlimitedPolicy/ ]; then if [ $test_only -eq 0 ]; then mkdir /tmp/UnlimitedPolicy/ - wget $unlimited_security_location/local_policy.jar -O /tmp/UnlimitedPolicy/local_policy.jar - wget $unlimited_security_location/US_export_policy.jar -O /tmp/UnlimitedPolicy/US_export_policy.jar + curl -sS $unlimited_security_location/local_policy.jar -o /tmp/UnlimitedPolicy/local_policy.jar + curl -sS $unlimited_security_location/US_export_policy.jar -o /tmp/UnlimitedPolicy/US_export_policy.jar else exit 0 fi diff --git a/sahara/plugins/cdh/v5_9_0/resources/images/common/add_jar b/sahara/plugins/cdh/v5_9_0/resources/images/common/add_jar index 4a1b57e210..1e98b7f100 100644 --- a/sahara/plugins/cdh/v5_9_0/resources/images/common/add_jar +++ b/sahara/plugins/cdh/v5_9_0/resources/images/common/add_jar @@ -9,7 +9,7 @@ SWIFT_LIB_URI="$HADOOP_SWIFT_BUILD_LOCATION/hadoop-openstack-${hadoop}.jar" HADOOP_SWIFT_JAR_NAME="hadoop-openstack.jar" if [ $test_only -eq 0 ]; then - wget -O $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME $SWIFT_LIB_URI + curl -sS -o $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME $SWIFT_LIB_URI if [ $? -ne 0 ]; then printf "Could not download Swift Hadoop FS implementation.\nAborting\n" diff --git a/sahara/plugins/cdh/v5_9_0/resources/images/common/install_extjs b/sahara/plugins/cdh/v5_9_0/resources/images/common/install_extjs index 39a63cd8d2..6b255f1d8f 100644 --- a/sahara/plugins/cdh/v5_9_0/resources/images/common/install_extjs +++ b/sahara/plugins/cdh/v5_9_0/resources/images/common/install_extjs @@ -8,7 +8,7 @@ extjs_archive=/tmp/${extjs_basepath} extjs_folder="${extjs_basepath%.*}" setup_extjs() { - wget -O $extjs_archive $EXTJS_DOWNLOAD_URL + curl -sS -o $extjs_archive $EXTJS_DOWNLOAD_URL mkdir -p $EXTJS_DESTINATION_DIR } diff --git a/sahara/plugins/cdh/v5_9_0/resources/images/common/unlimited_security_artifacts b/sahara/plugins/cdh/v5_9_0/resources/images/common/unlimited_security_artifacts index 5df39005c7..59dc11d642 100644 --- a/sahara/plugins/cdh/v5_9_0/resources/images/common/unlimited_security_artifacts +++ b/sahara/plugins/cdh/v5_9_0/resources/images/common/unlimited_security_artifacts @@ -3,8 +3,8 @@ if [ ! -n /tmp/UnlimitedPolicy/ ]; then if [ $test_only -eq 0 ]; then mkdir /tmp/UnlimitedPolicy/ - wget $unlimited_security_location/local_policy.jar -O /tmp/UnlimitedPolicy/local_policy.jar - wget $unlimited_security_location/US_export_policy.jar -O /tmp/UnlimitedPolicy/US_export_policy.jar + curl -sS $unlimited_security_location/local_policy.jar -o /tmp/UnlimitedPolicy/local_policy.jar + curl -sS $unlimited_security_location/US_export_policy.jar -o /tmp/UnlimitedPolicy/US_export_policy.jar else exit 0 fi diff --git a/sahara/plugins/mapr/resources/images/common/configure_extjs b/sahara/plugins/mapr/resources/images/common/configure_extjs index 2d46d9d929..976d20797a 100644 --- a/sahara/plugins/mapr/resources/images/common/configure_extjs +++ b/sahara/plugins/mapr/resources/images/common/configure_extjs @@ -9,7 +9,7 @@ extjs_archive=/tmp/${extjs_basepath} extjs_folder="${extjs_basepath%.*}" function setup_extjs { - wget -O $extjs_archive $EXTJS_DOWNLOAD_URL + curl -sS -o $extjs_archive $EXTJS_DOWNLOAD_URL mkdir -p $EXTJS_DESTINATION_DIR }