equal
deleted
inserted
replaced
39 -- Substitute ~ with path to home directory in data path |
39 -- Substitute ~ with path to home directory in data path |
40 if CFG_DATADIR then |
40 if CFG_DATADIR then |
41 if os.getenv("HOME") then |
41 if os.getenv("HOME") then |
42 CFG_DATADIR = CFG_DATADIR:gsub("^~", os.getenv("HOME")); |
42 CFG_DATADIR = CFG_DATADIR:gsub("^~", os.getenv("HOME")); |
43 end |
43 end |
|
44 end |
|
45 |
|
46 if #arg > 0 and arg[1] ~= "--config" then |
|
47 print("Unknown command-line option: "..tostring(arg[1])); |
|
48 print("Perhaps you meant to use prosodyctl instead?"); |
|
49 return 1; |
44 end |
50 end |
45 |
51 |
46 -- Global 'prosody' object |
52 -- Global 'prosody' object |
47 local prosody = { events = require "util.events".new(); }; |
53 local prosody = { events = require "util.events".new(); }; |
48 _G.prosody = prosody; |
54 _G.prosody = prosody; |