From 9a0860bb6151ee58a6e21d3b8ad93f62705b0513 Mon Sep 17 00:00:00 2001
From: Martin Winkler <efelon@winklerfamilie.eu>
Date: Wed, 1 Jun 2022 22:49:35 +0200
Subject: [PATCH] Fix unbound variable errors

---
 seqs/ldap.sh   |  2 +-
 seqs/matrix.sh | 44 +++++++++++++++++---------------------------
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/seqs/ldap.sh b/seqs/ldap.sh
index 24ecc29..f356a9d 100755
--- a/seqs/ldap.sh
+++ b/seqs/ldap.sh
@@ -82,7 +82,7 @@ olcOverlay: {1}refint
 olcRefintAttribute: memberof member manager owner
 "
 
-step_7_info() { echo "Create base DNs for users ($LDAP_OU_USERS) and groups ($LDAP_OU_GROUPS)"; }
+step_7_info() { echo "Create base DNs for users (${LDAP_OU_USERS:-}) and groups (${LDAP_OU_GROUPS:-})"; }
 step_7() {
   variable2Ldif add "$ldapBase"
 }
diff --git a/seqs/matrix.sh b/seqs/matrix.sh
index 10ab812..8db3195 100755
--- a/seqs/matrix.sh
+++ b/seqs/matrix.sh
@@ -165,11 +165,13 @@ step_10_info() {
 step_10_alias() { echo "upgrade"; }
 step_10() {
   echo " [I] Upgrading $toolName"
+  disableErrorCheck
   exe source "${MATRIX_HOME}/env/bin/activate"
   exe pip install --upgrade pip
   exe pip install --upgrade matrix-synapse
   saveReturn $?
   exe deactivate
+  enableErrorCheck
   endReturn "Error upgrading $toolName"
 
   echo " [I] Restarting $toolName"
@@ -193,9 +195,7 @@ step_14_alias() { echo "version"; }
 step_14() {
   local synapseIP=localhost
   shift
-  if [ ! -z $1 ]; then
-    synapseIP="$1"
-  fi 
+  [ -n "${1:-}" ] && synapseIP="$1"
 
   local apiCall="http://${synapseIP}:8008/_synapse/admin/v1/server_version"
   # -sS to suppress download progress of curl
@@ -217,7 +217,7 @@ step_16() {
   local synapseIP=localhost
   local grepOut=" | grep -E '(\"total\":|\"name\":)'"
 
-  for arg in "$@" ; do
+  for _ in "$@" ; do
     case "$1" in
       -r)
         grepOut=""
@@ -229,9 +229,7 @@ step_16() {
     esac
   done
 
-  if [ ! -z $1 ]; then
-    synapseIP="$1"
-  fi 
+  [ -n "${1:-}" ] && synapseIP="$1"
 
   local apiCall="http://${synapseIP}:8008/_synapse/admin/v2/users"
   exep "curl -sS --header \"Authorization: Bearer $MATRIX_ACCESS\" \"$apiCall\" | python -m json.tool $grepOut"
@@ -247,14 +245,14 @@ step_20_info() {
   shift
   echoinfoArgs "[USER NAME]"
   echo -n "Reset user password"
-  contextExe && echoinfo " for $1" || echo
+  contextExe && echoinfo " for ${1:-}" || echo
 }
 step_20_alias() { echo "resetpw"; }
 step_20() {
   shift
   local user=
 
-  if [ ! -z $1 ]; then
+  if [ -n "${1:-}" ]; then
     user="$1"
   else
     exe read -p "User name: " user
@@ -287,7 +285,7 @@ step_22() {
   local synapseIP=localhost
   local grepOut=" | grep -E '(\"total\":|\"name\":|\"room_id\":)'"
 
-  for arg in "$@" ; do
+  for _ in "$@" ; do
     case "$1" in
       -r)
         grepOut=""
@@ -299,9 +297,7 @@ step_22() {
     esac
   done
 
-  if [ ! -z $1 ]; then
-    synapseIP="$1"
-  fi 
+  [ -n "${1:-}" ] && synapseIP="$1"
 
   local apiCall="http://${synapseIP}:8008/_synapse/admin/v1/rooms"
   exep "curl -sS --header \"Authorization: Bearer $MATRIX_ACCESS\" \"$apiCall\" | python -m json.tool $grepOut"
@@ -323,7 +319,7 @@ step_24() {
   local synapseIP=localhost
   local grepOut=" | grep -E '(\"total\":|\"members\":|\"@)'"
 
-  for arg in "$@" ; do
+  for _ in "$@" ; do
     case "$1" in
       -r)
         grepOut=""
@@ -335,14 +331,12 @@ step_24() {
     esac
   done
 
-  if [ ! -z $1 ]; then
+  if [ -n "${1:-}" ]; then
     roomId="$1"
     shift
   fi
 
-  if [ ! -z $1 ]; then
-    synapseIP="$1"
-  fi 
+  [ -n "${1:-}" ] && synapseIP="$1"
 
   local apiCall="http://${synapseIP}:8008/_synapse/admin/v1/rooms/$roomId/members"
   exep "curl -sS --header \"Authorization: Bearer $MATRIX_ACCESS\" \"$apiCall\" | python -m json.tool $grepOut"
@@ -363,9 +357,7 @@ step_26() {
   local arg
   local synapseIP=localhost
 
-  if [ ! -z $1 ]; then
-    synapseIP="$1"
-  fi 
+  [ -n "${1:-}" ] && synapseIP="$1"
 
   local apiCall="http://${synapseIP}:8008/_synapse/admin/v1/rooms"
   local arrRoom=( $(curl -sS --header "Authorization: Bearer $MATRIX_ACCESS" "$apiCall" | jq '.rooms[] | select(.joined_local_members == 0) | .room_id') )
@@ -393,16 +385,14 @@ step_28() {
   local roomId=""
   local synapseIP=localhost
 
-  if [ ! -z $1 ]; then
+  if [ -n "${1:-}" ]; then
     roomId="$1"
     shift
   else
     endReturn -o 1 "No room ID specified"
   fi
 
-  if [ ! -z $1 ]; then
-    synapseIP="$1"
-  fi 
+  [ -n "${1:-}" ] && synapseIP="$1"
 
   echo " [I] Deleting room with ID: $roomId"
 
@@ -441,7 +431,7 @@ step_30() {
     pgVerboseVac=""
   fi
 
-  if [ -z $1 ]; then
+  if [ -z "${1:-}" ]; then
     readDatabaseInfos
   else
     postgresDb="$1"
@@ -544,7 +534,7 @@ readDatabaseInfos() {
 
 # Needs readDatabaseInfos() to execute some commands
 toolScript() {
-  if [ ! -z "$1" ] ; then
+  if [ -n "${1:-}" ] ; then
     readDatabaseInfos
   fi
 }