diff options
| author | Matthew Wild <mwild1@gmail.com> | 2011-04-05 14:38:08 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2011-04-05 14:38:08 +0100 |
| commit | dc08b9834f4d9e00a204fe00b9e547924e0908e5 (patch) | |
| tree | 59ee455eed836439659c9f0fe7840831cbee4100 /tools/migration/migrator | |
| parent | 8c9d841c3d81694d063bd931dbfee0634f53e8f7 (diff) | |
| parent | c1e4f6fbdabf5fb3569498877647200daaa6867f (diff) | |
| download | prosody-dc08b9834f4d9e00a204fe00b9e547924e0908e5.tar.gz prosody-dc08b9834f4d9e00a204fe00b9e547924e0908e5.zip | |
Merge 0.8 -> trunk
Diffstat (limited to 'tools/migration/migrator')
| -rw-r--r-- | tools/migration/migrator/prosody_files.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/migration/migrator/prosody_files.lua b/tools/migration/migrator/prosody_files.lua index 0a610d0e..4e42f564 100644 --- a/tools/migration/migrator/prosody_files.lua +++ b/tools/migration/migrator/prosody_files.lua @@ -13,6 +13,7 @@ local mtools = require "migrator.mtools"; local next = next; local pairs = pairs; local json = require "util.json"; +local os_getenv = os.getenv; prosody = {}; local dm = require "util.datamanager" @@ -22,7 +23,7 @@ module "prosody_files" local function is_dir(path) return lfs.attributes(path, "mode") == "directory"; end local function is_file(path) return lfs.attributes(path, "mode") == "file"; end local function clean_path(path) - return path:gsub("\\", "/"):gsub("//+", "/"); + return path:gsub("\\", "/"):gsub("//+", "/"):gsub("^~", os_getenv("HOME") or "~"); end local encode, decode; do local urlcodes = setmetatable({}, { __index = function (t, k) t[k] = char(tonumber("0x"..k)); return t[k]; end }); |