From 022b1a2881a92a0675f7ce9cb70e5fa5d50f9056 Mon Sep 17 00:00:00 2001 From: Kyle Robbertze Date: Mon, 8 Nov 2021 10:22:07 +0200 Subject: [PATCH] chore: resolve shell warnings --- install | 4 ++-- uninstall | 4 ++-- utils/update-postgres-password | 3 ++- utils/update-rabbitmq-password | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/install b/install index 7bd9eeba4..241f59ac8 100755 --- a/install +++ b/install @@ -110,9 +110,9 @@ function loud() { function loudCmd() { if [[ ${_q} -eq 0 ]]; then verbose "$@" - eval "$@" + "$@" else - eval "$@" > /dev/null + "$@" > /dev/null fi } diff --git a/uninstall b/uninstall index f82c72414..8e7932c56 100755 --- a/uninstall +++ b/uninstall @@ -46,7 +46,7 @@ FILES=( ) echo -e "The following files, directories, and services will be removed:\n" -for i in ${FILES[*]}; do +for i in "${FILES[@]}"; do echo "$i" done echo "pip3 libretime-playout" @@ -76,7 +76,7 @@ set +e removeRabbitmqLibreTimeSettings set -e -for i in ${FILES[*]}; do +for i in "${FILES[@]}"; do rm -rf "$i" done diff --git a/utils/update-postgres-password b/utils/update-postgres-password index e1dd32355..4051e09c1 100755 --- a/utils/update-postgres-password +++ b/utils/update-postgres-password @@ -15,7 +15,8 @@ command -v openssl > /dev/null || error "openssl command not found!" command -v psql > /dev/null || error "psql command not found!" typeset -r DB_USER="airtime" -typeset -r DB_PASSWORD=$(openssl rand -hex 16) +DB_PASSWORD=$(openssl rand -hex 16) +typeset -r DB_PASSWORD echo "Changing password for database user '$DB_USER' to '$DB_PASSWORD'" sudo -u postgres psql -c "ALTER USER $DB_USER WITH PASSWORD '$DB_PASSWORD';" diff --git a/utils/update-rabbitmq-password b/utils/update-rabbitmq-password index ed39492f6..1300d5b0c 100755 --- a/utils/update-rabbitmq-password +++ b/utils/update-rabbitmq-password @@ -14,7 +14,8 @@ command -v openssl > /dev/null || error "openssl command not found!" command -v rabbitmqctl > /dev/null || error "rabbitmqctl command not found!" typeset -r RMQ_USER="airtime" -typeset -r RMQ_PASSWORD=$(openssl rand -hex 16) +RMQ_PASSWORD=$(openssl rand -hex 16) +typeset -r RMQ_PASSWORD # RabbitMQ echo "Changing password for rabbitmq user '$RMQ_USER' to '$RMQ_PASSWORD'"