mirror of
https://github.com/gryf/pentadactyl-pm.git
synced 2026-01-30 04:25:46 +01:00
Fix joinPaths when stuff dun't exist
This commit is contained in:
@@ -118,9 +118,16 @@ function IO() //{{{
|
||||
function joinPaths(head, tail)
|
||||
{
|
||||
let path = ioManager.getFile(head);
|
||||
path.appendRelativePath(ioManager.expandPath(tail)); // FIXME: should only expand env vars and normalise path separators
|
||||
if (path.exists())
|
||||
path.normalize();
|
||||
try
|
||||
{
|
||||
path.appendRelativePath(ioManager.expandPath(tail)); // FIXME: should only expand env vars and normalise path separators
|
||||
if (path.exists())
|
||||
path.normalize();
|
||||
}
|
||||
catch(e)
|
||||
{
|
||||
return { exists: function () false };
|
||||
}
|
||||
return path;
|
||||
}
|
||||
|
||||
@@ -943,7 +950,7 @@ lookup:
|
||||
|
||||
liberator.echomsg("finished sourcing " + filename.quote(), 2);
|
||||
|
||||
liberator.log("Sourced: " + file.path, 3);
|
||||
liberator.log("Sourced: " + filename, 3);
|
||||
}
|
||||
catch (e)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user