[gtk-osx: 21/48] Check for ninja in DEVPREFIX/bin as well as PATH before installing it.
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx: 21/48] Check for ninja in DEVPREFIX/bin as well as PATH before installing it.
- Date: Tue, 14 May 2019 23:58:16 +0000 (UTC)
commit 635717abd87bb9a4e3f1a9330d264fa29e7072ce
Author: John Ralls <jralls ceridwen us>
Date: Mon Apr 8 12:52:31 2019 -0700
Check for ninja in DEVPREFIX/bin as well as PATH before installing it.
gtk-osx-setup.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/gtk-osx-setup.sh b/gtk-osx-setup.sh
index 8d2a7ae..da52b51 100755
--- a/gtk-osx-setup.sh
+++ b/gtk-osx-setup.sh
@@ -110,7 +110,7 @@ fi
# Install Ninja
NINJA=`which ninja`
-if test ! -x "`eval echo $NINJA`"; then
+if test ! -x "$NINJA" -a ! -x "$DEVPREFIX/bin/ninja"; then
curl -kLs https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-mac.zip -o
"$DEVPREFIX/ninja-mac.zip"
unzip -d "$DEVPREFIX/bin" "$DEVPREFIX/ninja-mac.zip"
rm "$DEVPREFIX/ninja-mac.zip"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]