Merge pull request #145 from harryfwong/master

Address installation script issues
paulopinheiro1234 · Mar 16, 2020 · 003ab08 · 003ab08
2 parents 0f46806 + 07da1a6
commit 003ab08
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git 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/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])

diff --git 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
@@ -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
+