aboutsummaryrefslogtreecommitdiffstats
path: root/tools/win-setup.sh
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2010-01-15 21:09:54 +0000
committerBill Meier <wmeier@newsguy.com>2010-01-15 21:09:54 +0000
commit66650422deec4713eac5f80de825844859afefad (patch)
treee22670d8e31a9ffbdd04e19974fcce6225f58d59 /tools/win-setup.sh
parent508fd83368d304a0ec10d329f88fcf2ff01e8ad6 (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". svn path=/trunk/; revision=31538
Diffstat (limited to 'tools/win-setup.sh')
-rwxr-xr-xtools/win-setup.sh2
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$