[tor-commits] [tor-launcher/master] ESR24 compat: compute correct paths for tor files.

[mikeperry at torproject.org]

commit da3722db2b53dd8c2aa7e07dab9d06ac73701b94
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Fri Oct 18 14:41:31 2013 -0400

    ESR24 compat: compute correct paths for tor files.
    
    In FF21+, CurProcD points to the browser subdirectory, so we need to go
    up one more level to reach the TBB installation directory.
---
 src/components/tl-process.js |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/tl-process.js b/src/components/tl-process.js
index ed7e761..aef961c 100644
--- a/src/components/tl-process.js
+++ b/src/components/tl-process.js
@@ -528,7 +528,9 @@ TorProcessService.prototype =
           else
           {
             // For Firefox, paths are relative to the top of the TBB install.
-            var tbbBrowserDepth = 1; // Windows and Linux
+            // In FF21+, CurProcD is the "browser" directory that is next to
+            // the firefox binary, e.g., <TorFileBaseDir>/Browser/browser
+            var tbbBrowserDepth = 2; // Windows and Linux
             if (TorLauncherUtil.isMac)
               tbbBrowserDepth += 4;