diff options
| author | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2011-01-14 09:17:19 +0000 |
|---|---|---|
| committer | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2011-01-14 09:17:19 +0000 |
| commit | c9855e38aefa03b163938448bdd6c04183a981d3 (patch) | |
| tree | 81ecb3028c7c0f69d34903a1c02aabf96b961d36 /mediaplugin/dists/buildbot | |
| parent | 67d7b72a4d1af427338c858ab5922fe967f3de92 (diff) | |
| download | usdx-c9855e38aefa03b163938448bdd6c04183a981d3.tar.gz usdx-c9855e38aefa03b163938448bdd6c04183a981d3.tar.xz usdx-c9855e38aefa03b163938448bdd6c04183a981d3.zip | |
allow /usr/bin/grep.exe
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2797 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'mediaplugin/dists/buildbot')
| -rwxr-xr-x | mediaplugin/dists/buildbot/win32-delphi-build.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mediaplugin/dists/buildbot/win32-delphi-build.sh b/mediaplugin/dists/buildbot/win32-delphi-build.sh index 96ce435e..6a045bd1 100755 --- a/mediaplugin/dists/buildbot/win32-delphi-build.sh +++ b/mediaplugin/dists/buildbot/win32-delphi-build.sh @@ -1,6 +1,7 @@ +#!/bin/bash # check if the MinGW/Msys grep is used and not Borland's or FPC's version GREP_DIR=`which grep` -if [ "$GREP_DIR" != "/bin/grep.exe" ]; then +if ([ "$GREP_DIR" != "/bin/grep.exe" ] && [ "$GREP_DIR" != "/usr/bin/grep.exe" ]); then echo "Incorrect version of grep ($GREP_DIR)" echo "Make sure mingw/msys precede FPC and Delphi in the PATH environment." exit 1 |