From 5faf8a2376e207e0e554f4f7339aad49cd2f0f5b Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Mon, 19 Apr 2010 17:56:14 -0300 Subject: Be case-insensitive in CLI commands. (Backport from svn) --- src/luarocks/build.lua | 2 +- src/luarocks/install.lua | 3 ++- src/luarocks/list.lua | 2 +- src/luarocks/search.lua | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua index 085c7b40..62ac3808 100644 --- a/src/luarocks/build.lua +++ b/src/luarocks/build.lua @@ -280,7 +280,7 @@ function run(...) return build_rock(name, true) elseif not name:match(dir.separator) then local search = require("luarocks.search") - return search.act_on_src_or_rockspec(run, name, version) + return search.act_on_src_or_rockspec(run, name:lower(), version) end return nil, "Don't know what to do with "..name end diff --git a/src/luarocks/install.lua b/src/luarocks/install.lua index 76793a3f..260c7751 100644 --- a/src/luarocks/install.lua +++ b/src/luarocks/install.lua @@ -32,6 +32,7 @@ function install_binary_rock(rock_file) if not name then return nil, "Filename "..rock_file.." does not match format 'name-version-revision.arch.rock'." end + if arch ~= "all" and arch ~= cfg.arch then return nil, "Incompatible architecture "..arch, "arch" end @@ -105,7 +106,7 @@ function run(...) return install_binary_rock(name) else local search = require("luarocks.search") - local results, err = search.find_suitable_rock(search.make_query(name, version)) + local results, err = search.find_suitable_rock(search.make_query(name:lower(), version)) if err then return nil, err elseif type(results) == "string" then diff --git a/src/luarocks/list.lua b/src/luarocks/list.lua index 87c5a2ae..567ee188 100644 --- a/src/luarocks/list.lua +++ b/src/luarocks/list.lua @@ -21,7 +21,7 @@ help = [[ function run(...) local flags, filter, version = util.parse_flags(...) local results = {} - local query = search.make_query(filter or "", version) + local query = search.make_query(filter and filter:lower() or "", version) query.exact_name = false for _, tree in ipairs(cfg.rocks_trees) do search.manifest_search(results, path.rocks_dir(tree), query) diff --git a/src/luarocks/search.lua b/src/luarocks/search.lua index adbf47a8..6303eb8c 100644 --- a/src/luarocks/search.lua +++ b/src/luarocks/search.lua @@ -374,7 +374,7 @@ function run(...) return nil, "Enter name and version or use --all; see help." end - local query = make_query(name, version) + local query = make_query(name:lower(), version) query.exact_name = false local results, err = search_repos(query) if not results then -- cgit v1.2.3-55-g6feb