aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHisham Muhammad <hisham@gobolinux.org>2018-06-13 10:56:23 -0300
committerHisham Muhammad <hisham@gobolinux.org>2018-06-28 17:28:40 -0300
commit7a0622ce1cc2c518d1046ffed430fe16b92c18e1 (patch)
treef34a9c000dacd3f8551d6ec8787934d1c365c5c7
parent0dc948de780f3ace7e14284fc1d6cc1fe46abab7 (diff)
downloadluarocks-7a0622ce1cc2c518d1046ffed430fe16b92c18e1.tar.gz
luarocks-7a0622ce1cc2c518d1046ffed430fe16b92c18e1.tar.bz2
luarocks-7a0622ce1cc2c518d1046ffed430fe16b92c18e1.zip
Nicer-looking path for project dir
-rw-r--r--.gitignore2
-rw-r--r--src/luarocks/command_line.lua1
2 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 97698111..bee8dfb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@
12/dev_* 12/dev_*
13/gh-pages 13/gh-pages
14/wiki 14/wiki
15/lua
16/lua_modules
diff --git a/src/luarocks/command_line.lua b/src/luarocks/command_line.lua
index 7d9cc4af..5ba5ae1b 100644
--- a/src/luarocks/command_line.lua
+++ b/src/luarocks/command_line.lua
@@ -58,6 +58,7 @@ local function find_project_dir()
58 for _ = 1, 10 do -- FIXME detect when root dir was hit instead 58 for _ = 1, 10 do -- FIXME detect when root dir was hit instead
59 local abs = fs.absolute_name(try) 59 local abs = fs.absolute_name(try)
60 if fs.is_dir(abs .. "/.luarocks") and fs.is_dir(abs .. "/lua_modules") then 60 if fs.is_dir(abs .. "/.luarocks") and fs.is_dir(abs .. "/lua_modules") then
61 abs = abs:gsub("/.$", "")
61 return abs, abs .. "/lua_modules" 62 return abs, abs .. "/lua_modules"
62 end 63 end
63 try = try .. "/.." 64 try = try .. "/.."