From f5b0683a819eba7358bce23ac72c2558428ca4a7 Mon Sep 17 00:00:00 2001
From: "Don J. Rude" <djr7m@ccri.com>
Date: Tue, 2 Jan 2018 15:40:11 -0500
Subject: [PATCH 1/2] New Hadoop 2.7 release. Also, more straightforward
 pkg_pre_download

---
 bin/cloud-local.sh    | 7 +++----
 conf/cloud-local.conf | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/bin/cloud-local.sh b/bin/cloud-local.sh
index e323ef5..1bcd013 100755
--- a/bin/cloud-local.sh
+++ b/bin/cloud-local.sh
@@ -38,8 +38,7 @@ function download_packages {
   if [[ ! -z ${pkg_pre_download+x} ]]; then
     # Does that folder actually exist?
     if [[ -d ${pkg_pre_download} ]] ; then
-      test -d ${CLOUD_HOME}/pkg || rmdir ${CLOUD_HOME}/pkg
-      test -h ${CLOUD_HOME}/pkg && rm ${CLOUD_HOME}/pkg
+      rm -f pkg
       ln -s ${pkg_pre_download} ${CLOUD_HOME}/pkg
       echo "Skipping downloads... using ${pkg_pre_download}"
       return 0
@@ -98,7 +97,7 @@ function download_packages {
                    "${mirror}/zookeeper/zookeeper-${pkg_zookeeper_ver}/zookeeper-${pkg_zookeeper_ver}.tar.gz"
                    "${mirror}/spark/spark-${pkg_spark_ver}/spark-${pkg_spark_ver}-bin-${pkg_spark_hadoop_ver}.tgz")
 
-  
+
   if [[ "$kafka_enabled" -eq 1 ]]; then
     urls=("${urls[@]}" "${mirror}/kafka/${pkg_kafka_ver}/kafka_${pkg_kafka_scala_ver}-${pkg_kafka_ver}.tgz")
   fi
@@ -119,7 +118,7 @@ function download_packages {
       fname=$(basename "$x");
       echo "fetching ${x}";
       wget -c -O "${CLOUD_HOME}/pkg/${fname}" "$x" || { rm -f "${CLOUD_HOME}/pkg/${fname}"; echo "Error Downloading: ${fname}"; errorList="${errorList} ${x} ${NL}"; };
-  done 
+  done
 
   if [[ -n "${errorList}" ]]; then
     echo "Failed to download: ${NL} ${errorList}";
diff --git a/conf/cloud-local.conf b/conf/cloud-local.conf
index 1559f78..11ddbc2 100644
--- a/conf/cloud-local.conf
+++ b/conf/cloud-local.conf
@@ -27,7 +27,7 @@ pkg_src_maven="https://repo1.maven.org/maven2"
 pkg_accumulo_ver="1.8.1"
 pkg_hbase_ver="1.2.6"
 # Note pkg_spark_hadoop_ver below if modifying
-pkg_hadoop_ver="2.7.4"
+pkg_hadoop_ver="2.7.5"
 # Note, just the major+minor from Hadoop, not patch level
 hadoop_base_ver=${pkg_hadoop_ver:0:3}
 

From d11c2cbf834bbcf777da2f69e61bb4cd57cc26ab Mon Sep 17 00:00:00 2001
From: "Don J. Rude" <djr7m@ccri.com>
Date: Tue, 2 Jan 2018 15:51:38 -0500
Subject: [PATCH 2/2] AHeyne caught my mistake

---
 bin/cloud-local.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/cloud-local.sh b/bin/cloud-local.sh
index 1bcd013..40f5a19 100755
--- a/bin/cloud-local.sh
+++ b/bin/cloud-local.sh
@@ -38,7 +38,7 @@ function download_packages {
   if [[ ! -z ${pkg_pre_download+x} ]]; then
     # Does that folder actually exist?
     if [[ -d ${pkg_pre_download} ]] ; then
-      rm -f pkg
+      rm -f ${CLOUD_HOME}/pkg
       ln -s ${pkg_pre_download} ${CLOUD_HOME}/pkg
       echo "Skipping downloads... using ${pkg_pre_download}"
       return 0