diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-01-15 21:09:54 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-01-15 21:09:54 +0000 |
| commit | 209ec0bf8eb614fc68653b6e58c61d3323f47067 (patch) | |
| tree | e22670d8e31a9ffbdd04e19974fcce6225f58d59 /tools | |
| parent | b63190727b644992686661d5e34f16aab63c8d26 (diff) | |
For now: Add hack so \r ignored when win-setup.sh is invoked from a cygwin bash shell.
See: http://www.mail-archive.com/cygwin-announce@cygwin.com/msg01711.html
Note: another way to do this (as described in the above) might be to
"export the environment variable SHELLOPTS with igncr included in it.
It is read-only from within bash, but you can set it before invoking bash;
once in bash, it auto-tracks the current state of 'set -o igncr'
or 'shopt -s igncr'. If exported, then all bash child processes inherit
the same option settings".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31538 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/win-setup.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/win-setup.sh b/tools/win-setup.sh index 772c5fa5e7..2a746510b9 100755 --- a/tools/win-setup.sh +++ b/tools/win-setup.sh @@ -1,4 +1,6 @@ #!/bin/bash +(shopt -s igncr) 2>/dev/null && shopt -s igncr; # hack to force this file to be processed by cygwin bash with -o igncr + # needed when this file is exec'd from win32-set.sh & win64-setup.sh # # $Id$ |