From 838e37a178a8dacd3f0d08e1e76b0f5bc5f726dc Mon Sep 17 00:00:00 2001
From: Cloud User <maintuser@trtestfrmass01.treasury.local>
Date: Wed, 11 May 2022 18:51:20 +0000
Subject: [PATCH] fixed create/remove scripts

---
 setenv.sh             | 19 ++++++++++---------
 solr-backup.sh        |  0
 solr-create.sh        | 20 +++++++++++++++-----
 solr-docker-copy.sh   |  0
 solr-migrate-shard.sh |  0
 solr-pause.sh         |  0
 solr-remove.sh        |  9 ++++++++-
 solr-restore.sh       |  0
 solr-resume.sh        |  0
 solr-ssh-copy.sh      |  0
 10 files changed, 33 insertions(+), 15 deletions(-)
 mode change 100644 => 100755 setenv.sh
 mode change 100644 => 100755 solr-backup.sh
 mode change 100644 => 100755 solr-create.sh
 mode change 100644 => 100755 solr-docker-copy.sh
 mode change 100644 => 100755 solr-migrate-shard.sh
 mode change 100644 => 100755 solr-pause.sh
 mode change 100644 => 100755 solr-remove.sh
 mode change 100644 => 100755 solr-restore.sh
 mode change 100644 => 100755 solr-resume.sh
 mode change 100644 => 100755 solr-ssh-copy.sh

diff --git a/setenv.sh b/setenv.sh
old mode 100644
new mode 100755
index d4a7e18..a6e7347
--- a/setenv.sh
+++ b/setenv.sh
@@ -1,34 +1,35 @@
 #!/bin/bash
 
-if [[ ! -z "$SOLR_HOST" ]]; then
+if [[ -z "$SOLR_HOST" ]]; then
     echo "A SOLR_HOST environment variable is required"
     exit 1
 fi
 
-if [[ ! -z "$SOLR_PORT" ]]; then
+if [[ -z "$SOLR_PORT" ]]; then
     SOLR_PORT=8983
 fi
 
-if [[ ! -z "$SOLR_PROTOCOL" ]]; then
+if [[ -z "$SOLR_PROTOCOL" ]]; then
     SOLR_PROTOCOL=http
 fi
 
-if [[ ! -z "$SOLR_BASEPATH" ]]; then
+if [[ -z "$SOLR_BASEPATH" ]]; then
     SOLR_BASEPATH=/solr
 fi
 
-if [[ ! -z "$SOLR_BASEURL" ]]; then
-    SOLR_BASEURL=${SOLR_PROTOCOL}://${SOLR_HOST}:${SOLR_PORT}/$SOLR_BASEPATH
+if [[ -z "$SOLR_BASEURL" ]]; then
+    SOLR_BASEURL=${SOLR_PROTOCOL}://${SOLR_HOST}:${SOLR_PORT}${SOLR_BASEPATH}
 fi
+echo "Solr Base URL: ${SOLR_BASEURL}"
 
-if [[ ! -z "$SOLR_CORE" ]]; then
+if [[ -z "$SOLR_CORE" ]]; then
     SOLR_CORE=alfresco
 fi
 
-if [[ ! -z "$SOLR_LOCALPATH" ]]; then
+if [[ -z "$SOLR_LOCALPATH" ]]; then
     SOLR_LOCALPATH=/tmp
 fi
 
-if [[ ! -z "$SOLR_TEMPLATE" ]]; then
+if [[ -z "$SOLR_TEMPLATE" ]]; then
     SOLR_TEMPLATE=rerank
 fi
diff --git a/solr-backup.sh b/solr-backup.sh
old mode 100644
new mode 100755
diff --git a/solr-create.sh b/solr-create.sh
old mode 100644
new mode 100755
index c9307fb..3967a48
--- a/solr-create.sh
+++ b/solr-create.sh
@@ -8,18 +8,28 @@ ARG_SOLR_NODE_ID=$3
 ARG_SOLR_NODES=$4
 
 if [[ ! -z "$ARG_SOLR_SHARD_IDS" ]]; then
-    if [[ ! -z "$ARG_SOLR_SHARDS" ]]; then
+    if [[ -z "$ARG_SOLR_SHARDS" ]]; then
         echo "The expected number of shards is required"
         exit 1
     fi
-    if [[ ! -z "$ARG_SOLR_NODE_ID" ]]; then
+    if [[ -z "$ARG_SOLR_NODE_ID" ]]; then
         ARG_SOLR_NODE_ID=1
+	echo "A Solr instance node ID was not specified; using '1'"
     fi
-    if [[ ! -z "$ARG_SOLR_NODES" ]]; then
+    if [[ -z "$ARG_SOLR_NODES" ]]; then
         ARG_SOLR_NODES=1
+	echo "A total number of Solr instances was not specified; using '1'"
     fi
 
-    curl -SsL ${SOLR_BASEURL}/admin/cores?action=newCore\\&core=${SOLR_CORE}\\&storeRef=workspace://SpacesStore\\&numShards=${ARG_SOLR_SHARDS}\\&nodeInstance=${ARG_SOLR_NODE_ID}\\&numNodes=${ARG_SOLR_NODES}\\&template=${SOLR_TEMPLATE}\\&shardIds=${ARG_SOLR_SHARD_IDS}
+    echo "Creating a shard core in the Solr instance ..."
+    SOLR_URL="${SOLR_BASEURL}/admin/cores?action=newCore&core=${SOLR_CORE}&storeRef=workspace://SpacesStore&numShards=${ARG_SOLR_SHARDS}&nodeInstance=${ARG_SOLR_NODE_ID}&numNodes=${ARG_SOLR_NODES}&template=${SOLR_TEMPLATE}&shardIds=${ARG_SOLR_SHARD_IDS}"
 else
-    curl -SsL ${SOLR_BASEURL}/admin/cores?action=newCore\\&core=${SOLR_CORE}\\&storeRef=workspace://SpacesStore\\&template=${SOLR_TEMPLATE}
+    echo "No arguments were specified; creating a shard-less core in the Solr instance ..."
+    SOLR_URL="${SOLR_BASEURL}/admin/cores?action=newCore&core=${SOLR_CORE}&storeRef=workspace://SpacesStore&template=${SOLR_TEMPLATE}"
 fi
+
+if [[ ! -z "$DEBUG" ]]; then
+    echo "URL: ${SOLR_URL}"
+fi
+curl -SsL ${SOLR_URL}
+
diff --git a/solr-docker-copy.sh b/solr-docker-copy.sh
old mode 100644
new mode 100755
diff --git a/solr-migrate-shard.sh b/solr-migrate-shard.sh
old mode 100644
new mode 100755
diff --git a/solr-pause.sh b/solr-pause.sh
old mode 100644
new mode 100755
diff --git a/solr-remove.sh b/solr-remove.sh
old mode 100644
new mode 100755
index a8afa1c..059db4d
--- a/solr-remove.sh
+++ b/solr-remove.sh
@@ -7,4 +7,11 @@ if [[ ! -z "$ARG_SOLR_SHARD_ID" ]]; then
     SOLR_CORE=${SOLR_CORE}-${ARG_SOLR_SHARD_ID}
 fi
 
-curl -SsL ${SOLR_BASEURL}/admin/cores?action=UNLOAD\&core=${SOLR_CORE}\&deleteIndex=true\&deleteDataDir=true\&deleteInstanceDir=true
+echo "Removing a core in the Solr instance ..."
+SOLR_URL="${SOLR_BASEURL}/admin/cores?action=UNLOAD&core=${SOLR_CORE}&deleteIndex=true&deleteDataDir=true&deleteInstanceDir=true"
+
+if [[ ! -z "$DEBUG" ]]; then
+    echo "URL: ${SOLR_URL}"
+fi
+curl -SsL ${SOLR_URL}
+
diff --git a/solr-restore.sh b/solr-restore.sh
old mode 100644
new mode 100755
diff --git a/solr-resume.sh b/solr-resume.sh
old mode 100644
new mode 100755
diff --git a/solr-ssh-copy.sh b/solr-ssh-copy.sh
old mode 100644
new mode 100755