gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-23 01:15:46 +01:00
Code Issues Projects Releases Wiki Activity

Revert checking $LIBERATOR_HOME. Sorry, Ted, this is the kind of change that should be discussed first.

Browse Source
This commit is contained in:
Kris Maglione
2008-12-12 11:20:46 -05:00
parent e127db3273
commit 76ea4cacc0
1 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
common/content/io.js
View File

@@ -409,26 +409,15 @@ function IO() //{{{
if (WINDOWS) if (WINDOWS)
path = path.replace("/", "\\", "g"); path = path.replace("/", "\\", "g");
/* expand "~" to // expand ~
* (VIMPERATOR|MUTTATOR)_HOME or (depending on config.name) if (path[0] == "~")
* LIBERATOR_HOME or
* HOME (USERPROFILE or HOMEDRIVE\HOMEPATH on Windows if HOME is not set)
* in that order */
if (/^~/.test(path))
{ {
// First try (VIMPERATOR|MUTTATOR)_HOME // Try $(VIMPERATOR|MUTTATOR)_HOME || $HOME first, on all systems
let home = environmentService.get(config.name.toUpperCase() + "_HOME"); let home = environmentService.get(config.name.toUpperCase() + "_HOME") ||
environmentService.get("HOME");
// If no (VIMPERATOR|MUTTATOR)_HOME, then try LIBERATOR_HOME // Windows has its own ideosynchratic $HOME variables.
if (!home) if (!home && WINDOWS)
home = environmentService.get("LIBERATOR_HOME");
// If no (VIMPERATOR|MUTTATOR)_HOME, try HOME
if (!home)
home = environmentService.get("HOME");
// On Windows, stretch even farther for other options
if (WINDOWS && !home)
home = environmentService.get("USERPROFILE") || home = environmentService.get("USERPROFILE") ||
environmentService.get("HOMEDRIVE") + environmentService.get("HOMEPATH"); environmentService.get("HOMEDRIVE") + environmentService.get("HOMEPATH");
@@ -440,7 +429,7 @@ function IO() //{{{
// Kris reckons we shouldn't replicate this 'bug'. --djk // Kris reckons we shouldn't replicate this 'bug'. --djk
// TODO: should we be doing this for all paths? // TODO: should we be doing this for all paths?
path = path.replace( path = path.replace(
RegExp("\\$(\\w+)\\b|\\${(\\w+)}" + (WINDOWS ? "|%(\\w+)%" : ""), "g"), !WINDOWS ? /\$(\w+)\b|\${(\w+)}/g : /\$(\w+)\b|\${(\w+)}|%(\w+)%/g,
function (m, n1, n2, n3) environmentService.get(n1 || n2 || n3) || m function (m, n1, n2, n3) environmentService.get(n1 || n2 || n3) || m
); );