From d6e4ca09734a21aefed344f6ba0b126f2b2ff65a Mon Sep 17 00:00:00 2001 From: LinuxSquare Date: Sat, 16 Mar 2024 21:14:18 +0100 Subject: [PATCH] surround ALL variables with {} --- utils/attach | 4 ++-- utils/delete | 2 +- utils/logging | 15 ++++++++------- utils/stop | 8 ++++---- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/utils/attach b/utils/attach index d9ed871..b5e7b48 100644 --- a/utils/attach +++ b/utils/attach @@ -5,6 +5,6 @@ function attach() { log e "Container '${1}' is not running!" exit 1 fi - log i "Attaching to container '$1'" - podman container attach "$1" + log i "Attaching to container '${1}'" + podman container attach "${1}" } diff --git a/utils/delete b/utils/delete index 1d76c04..a23b33e 100644 --- a/utils/delete +++ b/utils/delete @@ -19,5 +19,5 @@ function delete() { done rm -rf "$delDir" - log s "Server '$1' deleted!" + log s "Server '${1}' deleted!" } diff --git a/utils/logging b/utils/logging index ece1a8a..849d096 100644 --- a/utils/logging +++ b/utils/logging @@ -15,40 +15,41 @@ readonly RESET="\033[0m" function log() { local prefix - type=$1 + type=${1} print=false shift message=$@ - case $type in + case ${type} in "s") print=true prefix="${GREEN}[SUCCESS]${RESET}" ;; "d") - if [[ "$debuglevel" -ge 4 ]]; then + if [[ "${debuglevel}" -ge 4 ]]; then print=true fi prefix="${MAGENTA}[DEBUG]${RESET}" ;; "i") - if [[ "$debuglevel" -ge 1 ]]; then + if [[ "${debuglevel}" -ge 1 ]]; then print=true fi prefix="${BLUE}[INFO]${RESET}" ;; "w") - if [[ "$debuglevel" -ge 2 ]]; then + if [[ "${debuglevel}" -ge 2 ]]; then print=true fi prefix="${YELLOW}[WARN]${RESET}" ;; "e") - if [[ "$debuglevel" -ge 3 ]]; then + if [[ "${debuglevel}" -ge 3 ]]; then print=true fi prefix="${RED}[ERR]${RESET}" ;; esac - "$print" && echo -e "$prefix $message" + "${print}" && echo -e "${prefix} ${message}" + return 0 } diff --git a/utils/stop b/utils/stop index bbdda1a..09513a0 100644 --- a/utils/stop +++ b/utils/stop @@ -1,10 +1,10 @@ #!/usr/bin/env bash function stop() { - if [[ -z $(podman container ps | grep "$1") ]]; then - log w "Container '$1' is not running!" + if [[ -z $(podman container ps | grep "${1}") ]]; then + log w "Container '${1}' is not running!" return 1 fi - log i "Stopping container '$1'" - stopContainer "$1" + log i "Stopping container '${1}'" + stopContainer "${1}" }