projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tools/migration/prosody-migrator.lua: Add messages to show when migration is in progress
[prosody.git]
/
tools
/
migration
/
prosody-migrator.lua
diff --git
a/tools/migration/prosody-migrator.lua
b/tools/migration/prosody-migrator.lua
index 20631fb1863a8b922daaa2131b1b2c6fa79abbcf..2a8bf1c3d445eadae87b046c713df327e838601a 100644
(file)
--- a/
tools/migration/prosody-migrator.lua
+++ b/
tools/migration/prosody-migrator.lua
@@
-3,6
+3,15
@@
CFG_SOURCEDIR=os.getenv("PROSODY_SRCDIR");
CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR");
CFG_SOURCEDIR=os.getenv("PROSODY_SRCDIR");
CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR");
+-- Substitute ~ with path to home directory in paths
+if CFG_CONFIGDIR then
+ CFG_CONFIGDIR = CFG_CONFIGDIR:gsub("^~", os.getenv("HOME"));
+end
+
+if CFG_SOURCEDIR then
+ CFG_SOURCEDIR = CFG_SOURCEDIR:gsub("^~", os.getenv("HOME"));
+end
+
local default_config = (CFG_CONFIGDIR or ".").."/migrator.cfg.lua";
-- Command-line parsing
local default_config = (CFG_CONFIGDIR or ".").."/migrator.cfg.lua";
-- Command-line parsing
@@
-116,9
+125,10
@@
local writer = require("migrator."..otype).writer(config[to_store]);
local json = require "util.json";
local json = require "util.json";
+io.stderr:write("Migrating...\n");
for x in reader do
--print(json.encode(x))
writer(x);
end
writer(nil); -- close
for x in reader do
--print(json.encode(x))
writer(x);
end
writer(nil); -- close
-
+io.stderr:write("Done!\n");