Skip to content

Commit bd82241

Browse files
authored
Fix reversed logic of OSX checks (#1709)
`-z` means “is empty”
1 parent 0c92d83 commit bd82241

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

tools/setup

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ export OSX=$(uname | grep -i '^darwin')
1010
if ! docker-compose -v &> /dev/null
1111
then
1212
echo "Before running this script, install Docker and Docker Compose."
13-
if [ -z $OSX ]
13+
if [ -z "$OSX" ]
1414
then
15-
echo "Download the latest community edition here:"
16-
echo "https://docs.docker.com/docker-for-mac/release-notes/"
17-
else
1815
echo "Find installation instructions for your distro here:"
1916
echo "https://docs.docker.com/install/linux/docker-ce/ubuntu/"
17+
else
18+
echo "Download the latest community edition here:"
19+
echo "https://docs.docker.com/docker-for-mac/release-notes/"
2020
fi
2121
exit 1
2222
fi
@@ -27,13 +27,13 @@ then
2727
exit 1
2828
fi
2929

30-
if [ -z $OSX ]
30+
if [ -z "$OSX" ]
3131
then
32-
set -x
33-
ln -si docker-compose.sync.yml docker-compose.override.yml
34-
else
35-
set -ex
32+
set -e
3633
ln -si docker-compose.bind.yml docker-compose.override.yml
34+
else
35+
set -e
36+
ln -si docker-compose.sync.yml docker-compose.override.yml
3737
fi
3838

3939
docker pull popcodeorg/popcode:latest

0 commit comments

Comments
 (0)