yenon/ROS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed startscript (ShellCheck.net)

Browse Source
This commit is contained in:
yenon 2022-11-17 15:21:54 +01:00
parent ab21b4c285
commit f34088a1e7
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
start.sh
View File

@ -1,11 +1,11 @@
#!/bin/bash #!/bin/bash
if [ "$EUID" -e 0 ]; then if [[ "$EUID" = 0 ]]; then
printf "Please run as user. I will invoke sudo when needed." printf "Please run as user. I will invoke sudo when needed."
exit exit
fi fi
pushd $(dirname "$0") pushd "$(dirname "$0")" || exit
if [ ! -d "home" ]; then if [ ! -d "home" ]; then
mkdir home mkdir home
@ -20,23 +20,23 @@ grep -sqF -- "$ident" "home/.ssh/authorized_keys" || echo "$ident" >> "home/.ssh
sudo docker-compose down sudo docker-compose down
echo U_ID="$(id -u)" > $(dirname "$0")/.env echo U_ID="$(id -u)" > "$(dirname "$0")/.env"
echo G_ID="$(id -g)" >> $(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 build
sudo U_ID="$(id -u)" G_ID="$(id -g)" docker-compose up -d 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=() hosts=()
while read line; do while read -r line; do
hosts+=(`sudo docker inspect --format='{{ .Config.Hostname }}' $line`) hosts+=("$(sudo docker inspect --format='{{ .Config.Hostname }}' "$line")")
#xhost +local:`sudo docker inspect --format='{{ .Config.Hostname }}' $line` #xhost +local:`sudo docker inspect --format='{{ .Config.Hostname }}' $line`
done <<< "$up_result" done <<< "$up_result"
echo "Adding to xhost:" echo "Adding to xhost:"
for host in ${hosts[@]}; do for host in "${hosts[@]}"; do
echo " + $host" echo " + $host"
xhost "+local:$host" xhost "+local:$host"
done done
@ -45,9 +45,9 @@ echo "Attaching."
sudo docker-compose up sudo docker-compose up
echo "Removing from xhost:" echo "Removing from xhost:"
for host in ${hosts[@]}; do for host in "${hosts[@]}"; do
echo " - $host" echo " - $host"
xhost "-local:$host" xhost "-local:$host"
done done
popd popd || exit