[tor-commits] [tor-browser-build/master] Bug 31550: Stop using a heredoc in start-tor-browser

[boklm at torproject.org]

commit c5f30eb31a39a61fe300389fff1ff7adecb8b163
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 28 15:52:01 2019 -0400

    Bug 31550: Stop using a heredoc in start-tor-browser
    
    Fixes bug 24755.
---
 projects/tor-browser/RelativeLink/start-tor-browser | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/projects/tor-browser/RelativeLink/start-tor-browser b/projects/tor-browser/RelativeLink/start-tor-browser
index 0a1dcbf..5cb94ef 100755
--- a/projects/tor-browser/RelativeLink/start-tor-browser
+++ b/projects/tor-browser/RelativeLink/start-tor-browser
@@ -294,16 +294,13 @@ function setControlPortPasswd() {
     else
         complain "There seems to have been a quoting problem with your \
 TOR_CONTROL_PASSWD environment variable."
-        cat <<EOF
-
-The Tor ControlPort password should be given inside double quotes, inside single
-quotes, i.e. if the ControlPort password is “secret” (without curly quotes) then
-we must start this script after setting the environment variable exactly like
-this:
-
-  \$ TOR_CONTROL_PASSWD='"secret"' $myname
-
-EOF
+	echo "The Tor ControlPort password should be given inside double"
+	echo "quotes, inside single quotes. That is, if the ControlPort"
+	echo "password is “secret” (without curly quotes) then we must"
+	echo "start this script after setting the environment variable"
+	echo "exactly like this:"
+	echo
+	echo "  \$ TOR_CONTROL_PASSWD='\"secret\"' $myname"
     fi
 }