diff options
| author | Graham Bloice <graham.bloice@trihedral.com> | 2015-01-11 20:37:03 +0000 |
|---|---|---|
| committer | Graham Bloice <graham.bloice@trihedral.com> | 2015-01-12 10:23:00 +0000 |
| commit | 0385d1557d4bee1ae300643571b00dd468cb900f (patch) | |
| tree | a16e61962cbc84597fd555af0983b7254932d3c1 /tools | |
| parent | a49e1d54d95548475d670b766bd328a73afa427b (diff) | |
Fix Cygwin path in runa2x.sh
As I don't have Cygwin on the path, the uname -o call failed.
The method used here seems to work reliably without needing Cygwin
on the path.
Change-Id: I206db542b5e89895a43c48626e2d14fff380fc8f
Reviewed-on: https://code.wireshark.org/review/6497
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/runa2x.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/runa2x.sh b/tools/runa2x.sh index eb0687d1e6..21f4379af5 100644 --- a/tools/runa2x.sh +++ b/tools/runa2x.sh @@ -28,7 +28,10 @@ # to be a way to construct a Windows command line that can set the # environment variables below, then run /usr/bin/a2x (which is a symlink). -if [ `uname -o` != "Cygwin" ] ; then +# Ensure cygwin bin dir is on the path if running under it +if [[ $OSTYPE == "cygwin" ]]; then + PATH="/usr/bin:$PATH" +else >&2 echo "We're trying to limit the scope of this insanity to CMake + Cygwin" exit 1 fi |