osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

The problem was that if you do, for example: 

foo=`echo`

$foo won't be empty, it'll include the newline at the end of the output
of "echo".  The same applies for any other command; strip newlines from
the output of regtool to avoid that problem.

svn path=/trunk/; revision=31889
This commit is contained in:
Guy Harris 2010-02-15 23:26:43 +00:00
parent f3e871e659
commit cc1e71a2ac
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/win-setup.sh
View File

@ -54,9 +54,12 @@ find_proxy() {
fi
# ...and wget can't fetch two registry keys because...?
proxy_enabled=`regtool get /HKCU/Software/Microsoft/Windows/CurrentVersion/Internet\ Settings/ProxyEnable 2>/dev/null`
echo "proxy_enabled is:"
echo "$proxy_enabled" | od -bc
#
# If regtool prints a blank line, $proxy_enabled will
# not be a zero-length string, it'll be a newline.
# Strip out newlines so that doesn't happen.
#
proxy_enabled=`regtool get /HKCU/Software/Microsoft/Windows/CurrentVersion/Internet\ Settings/ProxyEnable 2>/dev/null | tr -d '\012'`
if [ -n "$proxy_enabled" -a "$proxy_enabled" -ne 0 ] ; then
export http_proxy=`regtool get /HKCU/Software/Microsoft/Windows/CurrentVersion/Internet\ Settings/ProxyServer 2>/dev/null`
echo "Using Internet Explorer proxy settings."