From b4ca141ab76feade8f9fc0eeaed2f91a3eda2029 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 20 Dec 2023 12:15:53 +0100
Subject: [PATCH] Simplify conditions for checking existence of environment
 variables after Ulf G. suggestion

Co-Authored-By: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
---
 deployment/scripts/cluster.backup.sh                   | 6 +++---
 deployment/scripts/cluster.maintenance.sh              | 2 +-
 deployment/scripts/cluster.neo4j.sh                    | 2 +-
 deployment/scripts/clusters.backup-multiple-servers.sh | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/deployment/scripts/cluster.backup.sh b/deployment/scripts/cluster.backup.sh
index 15a56b194..82cd85498 100755
--- a/deployment/scripts/cluster.backup.sh
+++ b/deployment/scripts/cluster.backup.sh
@@ -9,7 +9,7 @@ SCRIPT_PATH=$(realpath $0)
 SCRIPT_DIR=$(dirname $SCRIPT_PATH)
 
 # check CONFIGURATION
-if [[ -z "$CONFIGURATION" ]] || [[ $CONFIGURATION == "" ]]; then
+if [[ -z "$CONFIGURATION" ]]; then
   echo "!!! You must provide a CONFIGURATION via environment variable !!!"
   exit 1
 fi
@@ -34,11 +34,11 @@ kubectl --kubeconfig=${KUBECONFIG} -n default exec -it \
     $(kubectl --kubeconfig=${KUBECONFIG} -n default get pods | grep ocelot-neo4j | awk '{ print $1 }') \
     -- neo4j-admin dump --to=/var/lib/neo4j/$BACKUP_DATE-neo4j-dump
 # copy neo4j backup to local drive
-echo "Coping database ..."
+echo "Copying database to local file system ..."
 kubectl --kubeconfig=${KUBECONFIG} cp \
     default/$(kubectl --kubeconfig=${KUBECONFIG} -n default get pods | grep ocelot-neo4j |awk '{ print $1 }'):/var/lib/neo4j/$BACKUP_DATE-neo4j-dump $BACKUP_FOLDER/neo4j-dump
 # copy image data
-echo "Coping public uploads ..."
+echo "Copying public uploads to local file system ..."
 kubectl --kubeconfig=${KUBECONFIG} cp \
     default/$(kubectl --kubeconfig=${KUBECONFIG} -n default get pods | grep ocelot-backend |awk '{ print $1 }'):/app/public/uploads $BACKUP_FOLDER/public-uploads
 
diff --git a/deployment/scripts/cluster.maintenance.sh b/deployment/scripts/cluster.maintenance.sh
index 780b81bd6..7454c5a3c 100755
--- a/deployment/scripts/cluster.maintenance.sh
+++ b/deployment/scripts/cluster.maintenance.sh
@@ -5,7 +5,7 @@ SCRIPT_PATH=$(realpath $0)
 SCRIPT_DIR=$(dirname $SCRIPT_PATH)
 
 # check CONFIGURATION
-if [[ -z "$CONFIGURATION" ]] || [[ $CONFIGURATION == "" ]]; then
+if [[ -z "$CONFIGURATION" ]]; then
   echo "You must provide a `CONFIGURATION` via environment variable"
   exit 1
 fi
diff --git a/deployment/scripts/cluster.neo4j.sh b/deployment/scripts/cluster.neo4j.sh
index 3b284c0b7..b16dd78ac 100755
--- a/deployment/scripts/cluster.neo4j.sh
+++ b/deployment/scripts/cluster.neo4j.sh
@@ -5,7 +5,7 @@ SCRIPT_PATH=$(realpath $0)
 SCRIPT_DIR=$(dirname $SCRIPT_PATH)
 
 # check CONFIGURATION
-if [[ -z "$CONFIGURATION" ]] || [[ $CONFIGURATION == "" ]]; then
+if [[ -z "$CONFIGURATION" ]]; then
   echo "You must provide a `CONFIGURATION` via environment variable"
   exit 1
 fi
diff --git a/deployment/scripts/clusters.backup-multiple-servers.sh b/deployment/scripts/clusters.backup-multiple-servers.sh
index c4c4bb42d..dfab6b139 100755
--- a/deployment/scripts/clusters.backup-multiple-servers.sh
+++ b/deployment/scripts/clusters.backup-multiple-servers.sh
@@ -17,7 +17,7 @@ source ${SCRIPT_DIR}/../.env
 set +a
 
 # check BACKUP_CONFIGURATIONS
-if [[ -z "$BACKUP_CONFIGURATIONS" ]] || [[ $BACKUP_CONFIGURATIONS == "" ]]; then
+if [[ -z "$BACKUP_CONFIGURATIONS" ]]; then
   #%! echo "You must provide a BACKUP_CONFIGURATIONS via environment variable"
   printf "!!! You must provide a BACKUP_CONFIGURATIONS via environment variable !!!\n"
   exit 1