vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Update bootstrap.sh

Browse source 
On my OS X El Capitan machine `which` returns 1 if it can't find the binary. This kills the bootstrap script at the crucial moment when it detects that something needs to be installed. This change ignores unsuccessful exit codes from `which`. The man page for my `which` speaks of a `-s` switch that could be used instead of the `if [ -z`, but I don't know how portable this is.

This fixes Issue 850.
This commit is contained in:
Adrian Neumann 2017-02-24 19:25:39 +01:00 committed by GitHub
parent 77dab17722
commit db2a1f647d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bootstrap.sh
View file

@ -26,7 +26,7 @@ install_macos_pkg()
BIN_NAME=$PKG_NAME BIN_NAME=$PKG_NAME
fi fi
BIN_LOCATION=$(which $BIN_NAME) BIN_LOCATION=$(which $BIN_NAME || true)
if [ -z "$BIN_LOCATION" ]; then if [ -z "$BIN_LOCATION" ]; then
echo "$PKG_MANAGER install $PKG_NAME" echo "$PKG_MANAGER install $PKG_NAME"
$PKG_MANAGER install "$PKG_NAME" $PKG_MANAGER install "$PKG_NAME"