Skip to content
Snippets Groups Projects
Commit 7c4ac768 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame :jack_o_lantern: Committed by Richard Pospesel
Browse files

fixup! Bug 40597: Implement TorSettings module

Bug 41657: Remove references to data-outside-app-dir

While doing so, we have updated TorLauncherUtil.jsm, and we have found
some minor imperfections in Moat.jsm, that this commit fixes.
parent a2950fa0
Branches
Tags
1 merge request!580Rebase Tor Browser Alpha to 102.9.0esr
......@@ -88,12 +88,8 @@ class MeekTransport {
})();
// Convert meek client path to absolute path if necessary
let meekWorkDir = await TorLauncherUtil.getTorFile(
"pt-startup-dir",
false
);
let re = TorLauncherUtil.isWindows ? /^[A-Za-z]:\\/ : /^\//;
if (!re.test(meekClientPath)) {
let meekWorkDir = TorLauncherUtil.getTorFile("pt-startup-dir", false);
if (TorLauncherUtil.isPathRelative(meekClientPath)) {
let meekPath = meekWorkDir.clone();
meekPath.appendRelativePath(meekClientPath);
meekClientPath = meekPath.path;
......@@ -186,7 +182,7 @@ class MeekTransport {
let endIndex = stdout.lastIndexOf(CMETHODS_DONE);
if (endIndex != -1) {
endIndex += CMETHODS_DONE.length;
return stdout.substr(0, endIndex).split("\n");
return stdout.substring(0, endIndex).split("\n");
}
return getInitLines(stdout);
};
......
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment