[tor-commits] [torbrowser/maint-2.2] [Linux] Unbreak the "foozer is already running as PID 31337." message

[erinn at torproject.org]

commit 45f1a188c0f00d09e32fbe50a1f01fe99f2ea90f
Author: Robert Ransom <rransom.8774 at gmail.com>
Date:   Wed Aug 24 01:21:17 2011 -0400

    [Linux] Unbreak the "foozer is already running as PID 31337." message
    
    The $'\n\n' didn't do what I thought it would do.  bashism?  zshism?
    I have no idea where I saw that syntax.
    
    Still not quite right, because it used to (try to) complain about both
    Tor and Vidalia at the same time if both were running.
    (cherry picked from commit 0ca62c9b335c7a4e76c12ad4397f6e7653be89e0)
---
 src/RelativeLink/RelativeLink.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh
index 5be1bdc..708b68e 100755
--- a/src/RelativeLink/RelativeLink.sh
+++ b/src/RelativeLink/RelativeLink.sh
@@ -117,7 +117,7 @@ for process in tor vidalia
 	done
 
 if [ "$RUNNING" -eq 1 ]; then
-	complain "$process is already running as PID $pid."$'\n\n'"Please shut down the above process(es) before running Tor Browser Bundle."
+	complain "`printf "%s is already running as PID %s.\n\nPlease shut down the above process(es) before running Tor Browser Bundle." "$process" "$pid"`"
 	exit 1
 fi