From fd38618ca3fd1a7090175c2e0138c82232f916e7 Mon Sep 17 00:00:00 2001 From: Dmitriy Novash Date: Fri, 23 Dec 2022 18:20:08 +0200 Subject: [PATCH] fix bash warnings --- docker/docker-startup.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docker/docker-startup.sh b/docker/docker-startup.sh index 79b3c56..9c33c27 100755 --- a/docker/docker-startup.sh +++ b/docker/docker-startup.sh @@ -3,30 +3,30 @@ set -e if [ ! -z $IFM_DOCKER_UID ]; then # check if UID/GID are numeric - if ! echo "$IFM_DOCKER_UID$IFM_DOCKER_GID" | egrep "^[0-9]+$" >/dev/null 2>&1; then + if ! echo "$IFM_DOCKER_UID$IFM_DOCKER_GID" | grep -E "^[0-9]+$" >/dev/null 2>&1; then echo "FATAL: IFM_DOCKER_UID or IFM_DOCKER_GID are not numeric (UID: $IFM_DOCKER_UID, GID: $IFM_DOCKER_GID)" exit 1 fi # get GID if not set - if [ -z $IFM_DOCKER_GID ]; then - export IFM_DOCKER_GID=$IFM_DOCKER_UID + if [ -z "$IFM_DOCKER_GID" ]; then + export IFM_DOCKER_GID="$IFM_DOCKER_UID" fi # delete user if already exists - if getent passwd $IFM_DOCKER_UID >/dev/null 2>&1; then - deluser $(getent passwd $IFM_DOCKER_UID | sed "s/:.*//") + if getent passwd "$IFM_DOCKER_UID" >/dev/null 2>&1; then + deluser $(getent passwd "$IFM_DOCKER_UID" | sed "s/:.*//") fi # check if group already exists - if ! getent group $IFM_DOCKER_GID >/dev/null 2>&1; then - addgroup -g $IFM_DOCKER_GID -S www-data + if ! getent group "$IFM_DOCKER_GID" >/dev/null 2>&1; then + addgroup -g "$IFM_DOCKER_GID" -S www-data REAL_GROUP=www-data else - REAL_GROUP=$(getent group $IFM_DOCKER_GID | sed "s/:.*//") + REAL_GROUP=$(getent group "$IFM_DOCKER_GID" | sed "s/:.*//") fi - adduser -u $IFM_DOCKER_UID -SHDG $REAL_GROUP www-data + adduser -u "$IFM_DOCKER_UID" -SHDG "$REAL_GROUP" www-data else addgroup -g 33 -S www-data adduser -SHD -u 33 -G www-data www-data