From 5f267dba28b33c00f1a80c666fd7a9cfa1ec4ea9 Mon Sep 17 00:00:00 2001
From: Harry Wong <harryfwong@gmail.com>
Date: Thu, 5 Mar 2020 22:55:58 -0500
Subject: [PATCH 1/2] Break installation script if zip is missing ran dos2unix
 on file to remove windows line endings

---
 install_hadatac.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/install_hadatac.sh b/install_hadatac.sh
index d86484bdd..e7d6724a8 100755
--- a/install_hadatac.sh
+++ b/install_hadatac.sh
@@ -16,6 +16,18 @@ echo "     300Mbytes of data. Make sure you have a decent connection and"
 echo "     this data availability."
 echo ""
 
+dpkg -s zip &> /dev/null  
+
+if [ $? -ne 0 ]
+
+  then
+    echo "  2) Program missing: 'zip' is required for installation"  
+    echo "     Please install zip before proceeding"
+    echo ""
+    exit 
+fi
+
+
 if [ "$#" -gt 0 ]; then
   case $1 in
     [yY][eE][sS]|[yY])

From 07da1a62d008e3bb4a442fa6fac4fa36431b0e4e Mon Sep 17 00:00:00 2001
From: Harry Wong <harryfwong@gmail.com>
Date: Thu, 5 Mar 2020 23:26:58 -0500
Subject: [PATCH 2/2] ran dos2unix on all files to remove windows new lines
 added blank line so that we could commit

---
 create_namespaces.sh | 1 +
 solr/run_solr6.sh    | 1 +
 solr/solr6.in.sh     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/create_namespaces.sh b/create_namespaces.sh
index 1ccfc152f..742fbbefc 100755
--- a/create_namespaces.sh
+++ b/create_namespaces.sh
@@ -9,3 +9,4 @@ echo ""
 echo "=== Creating store_users namespace..."
 curl -X POST --data-binary @blazegraph/store_users.properties -H 'Content-Type:text/plain' http://localhost:8080/blazegraph/namespace
 echo ""
+
diff --git a/solr/run_solr6.sh b/solr/run_solr6.sh
index 48ff56bce..f428f6137 100755
--- a/solr/run_solr6.sh
+++ b/solr/run_solr6.sh
@@ -23,3 +23,4 @@ case "$1" in
 esac
 
 SOLR_INCLUDE=$SOLR_ENV $SOLR_INSTALL_DIR/bin/solr $SOLR_CMD -force
+
diff --git a/solr/solr6.in.sh b/solr/solr6.in.sh
index e07133576..fbfcf07e2 100755
--- a/solr/solr6.in.sh
+++ b/solr/solr6.in.sh
@@ -3,3 +3,4 @@ SOLR_HOME=$HADATAC_SOLR/solr-home
 LOG4J_PROPS=$HADATAC_SOLR/solr-6.5.0/server/resources/log4j.properties
 SOLR_LOGS_DIR=$HADATAC_SOLR/solr-6.5.0/server/logs
 SOLR_PORT=8983
+