From f34088a1e75d791ffd4034e172c9c0fbe7e6a43c Mon Sep 17 00:00:00 2001 From: yenon Date: Thu, 17 Nov 2022 15:21:54 +0100 Subject: [PATCH] Fixed startscript (ShellCheck.net) --- start.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/start.sh b/start.sh index 99f8430..43e5c07 100755 --- a/start.sh +++ b/start.sh @@ -1,11 +1,11 @@ #!/bin/bash -if [ "$EUID" -e 0 ]; then +if [[ "$EUID" = 0 ]]; then printf "Please run as user. I will invoke sudo when needed." exit fi -pushd $(dirname "$0") +pushd "$(dirname "$0")" || exit if [ ! -d "home" ]; then mkdir home @@ -20,23 +20,23 @@ grep -sqF -- "$ident" "home/.ssh/authorized_keys" || echo "$ident" >> "home/.ssh sudo docker-compose down -echo U_ID="$(id -u)" > $(dirname "$0")/.env -echo G_ID="$(id -g)" >> $(dirname "$0")/.env +echo U_ID="$(id -u)" > "$(dirname "$0")/.env" +echo G_ID="$(id -g)" >> "$(dirname "$0")/.env" sudo U_ID="$(id -u)" G_ID="$(id -g)" docker-compose build sudo U_ID="$(id -u)" G_ID="$(id -g)" docker-compose up -d -up_result=$(sudo docker-compose ps -q) +up_result="$(sudo docker-compose ps -q)" hosts=() -while read line; do - hosts+=(`sudo docker inspect --format='{{ .Config.Hostname }}' $line`) +while read -r line; do + hosts+=("$(sudo docker inspect --format='{{ .Config.Hostname }}' "$line")") #xhost +local:`sudo docker inspect --format='{{ .Config.Hostname }}' $line` done <<< "$up_result" echo "Adding to xhost:" -for host in ${hosts[@]}; do +for host in "${hosts[@]}"; do echo " + $host" xhost "+local:$host" done @@ -45,9 +45,9 @@ echo "Attaching." sudo docker-compose up echo "Removing from xhost:" -for host in ${hosts[@]}; do +for host in "${hosts[@]}"; do echo " - $host" xhost "-local:$host" done -popd +popd || exit