diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2019-06-03 15:58:23 -0300 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2019-06-03 18:48:42 -0300 |
| commit | 7b82ed24f4409ca4c2401eac479a66ad6020f547 (patch) | |
| tree | b4603baa2af3ca708b2f6f2fb66f522175a1b6f9 | |
| parent | a61d362c5a78edfe7a0f6662747934f0a2124603 (diff) | |
| download | luarocks-7b82ed24f4409ca4c2401eac479a66ad6020f547.tar.gz luarocks-7b82ed24f4409ca4c2401eac479a66ad6020f547.tar.bz2 luarocks-7b82ed24f4409ca4c2401eac479a66ad6020f547.zip | |
help: use absolute paths
| -rw-r--r-- | src/luarocks/cmd/help.lua | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/luarocks/cmd/help.lua b/src/luarocks/cmd/help.lua index dcc9e358..a508953a 100644 --- a/src/luarocks/cmd/help.lua +++ b/src/luarocks/cmd/help.lua | |||
| @@ -9,6 +9,7 @@ local help = {} | |||
| 9 | local util = require("luarocks.util") | 9 | local util = require("luarocks.util") |
| 10 | local cfg = require("luarocks.core.cfg") | 10 | local cfg = require("luarocks.core.cfg") |
| 11 | local dir = require("luarocks.dir") | 11 | local dir = require("luarocks.dir") |
| 12 | local fs = require("luarocks.fs") | ||
| 12 | 13 | ||
| 13 | local program = util.this_program("luarocks") | 14 | local program = util.this_program("luarocks") |
| 14 | 15 | ||
| @@ -90,23 +91,23 @@ function help.command(description, commands, command) | |||
| 90 | util.printout() | 91 | util.printout() |
| 91 | util.printout("\tConfiguration files:") | 92 | util.printout("\tConfiguration files:") |
| 92 | local conf = cfg.config_files | 93 | local conf = cfg.config_files |
| 93 | util.printout("\t\tSystem : ".. dir.normalize(conf.system.file) .. " (" .. get_status(conf.system.found) ..")") | 94 | util.printout("\t\tSystem : ".. fs.absolute_name(conf.system.file) .. " (" .. get_status(conf.system.found) ..")") |
| 94 | if conf.user.file then | 95 | if conf.user.file then |
| 95 | util.printout("\t\tUser : ".. dir.normalize(conf.user.file) .. " (" .. get_status(conf.user.found) ..")") | 96 | util.printout("\t\tUser : ".. fs.absolute_name(conf.user.file) .. " (" .. get_status(conf.user.found) ..")") |
| 96 | else | 97 | else |
| 97 | util.printout("\t\tUser : disabled in this LuaRocks installation.") | 98 | util.printout("\t\tUser : disabled in this LuaRocks installation.") |
| 98 | end | 99 | end |
| 99 | if conf.project then | 100 | if conf.project then |
| 100 | util.printout("\t\tProject : ".. dir.normalize(conf.project.file) .. " (" .. get_status(conf.project.found) ..")") | 101 | util.printout("\t\tProject : ".. fs.absolute_name(conf.project.file) .. " (" .. get_status(conf.project.found) ..")") |
| 101 | end | 102 | end |
| 102 | util.printout() | 103 | util.printout() |
| 103 | util.printout("\tRocks trees in use: ") | 104 | util.printout("\tRocks trees in use: ") |
| 104 | for _, tree in ipairs(cfg.rocks_trees) do | 105 | for _, tree in ipairs(cfg.rocks_trees) do |
| 105 | if type(tree) == "string" then | 106 | if type(tree) == "string" then |
| 106 | util.printout("\t\t"..dir.normalize(tree)) | 107 | util.printout("\t\t"..fs.absolute_name(tree)) |
| 107 | else | 108 | else |
| 108 | local name = tree.name and " (\""..tree.name.."\")" or "" | 109 | local name = tree.name and " (\""..tree.name.."\")" or "" |
| 109 | util.printout("\t\t"..dir.normalize(tree.root)..name) | 110 | util.printout("\t\t"..fs.absolute_name(tree.root)..name) |
| 110 | end | 111 | end |
| 111 | end | 112 | end |
| 112 | util.printout() | 113 | util.printout() |
