Software / code / prosody
Changeset
6584:c3a56f8847ac
prosodyctl: Show relative paths in about
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 04 Jul 2014 23:13:51 +0200 |
| parents | 6583:93bab6958683 |
| children | 6585:ec94dc502113 |
| files | prosodyctl |
| diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/prosodyctl Mon Mar 23 18:42:11 2015 +0100 +++ b/prosodyctl Fri Jul 04 23:13:51 2014 +0200 @@ -528,16 +528,18 @@ 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);
