aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-07-04 23:13:51 +0200
committerKim Alvefur <zash@zash.se>2014-07-04 23:13:51 +0200
commitc91c96013614d80f7755149971f8afb7ce74ebc1 (patch)
tree8b3df2b42b572dfe2fa60ba7e6ab15ef3c6eaf68
parent92e7f6f56a739f3e7562c948b073bd9c1c0b2ea8 (diff)
downloadprosody-c91c96013614d80f7755149971f8afb7ce74ebc1.tar.gz
prosody-c91c96013614d80f7755149971f8afb7ce74ebc1.zip
prosodyctl: Show relative paths in about
-rwxr-xr-xprosodyctl10
1 files changed, 6 insertions, 4 deletions
diff --git a/prosodyctl b/prosodyctl
index bfb118c3..60bc0c08 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -528,16 +528,18 @@ function commands.about(arg)
return 1;
end
+ local pwd = ".";
local array = require "util.array";
local keys = require "util.iterators".keys;
+ local relpath = config.resolve_relative_path;
print("Prosody "..(prosody.version or "(unknown version)"));
print("");
print("# Prosody directories");
- print("Data directory: ", CFG_DATADIR or "./");
- print("Plugin directory:", CFG_PLUGINDIR or "./");
- print("Config directory:", CFG_CONFIGDIR or "./");
- print("Source directory:", CFG_SOURCEDIR or "./");
+ print("Data directory: "..relpath(pwd, data_path));
+ print("Plugin directory: "..relpath(pwd, CFG_PLUGINDIR or "."));
+ print("Config directory: "..relpath(pwd, CFG_CONFIGDIR or "."));
+ print("Source directory: "..relpath(pwd, CFG_SOURCEDIR or "."));
print("");
print("# Lua environment");
print("Lua version: ", _G._VERSION);