diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2013-11-12 16:45:24 -0200 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2013-11-12 16:45:24 -0200 |
commit | 8863788a986e11d564c98af0de89def47c83193c (patch) | |
tree | 6b163bd7cd11a7d634a126baf7b43d5949f60607 /src/bin | |
parent | 143cc28429bae0ba72c08433e21aacdf3723d72f (diff) | |
download | luarocks-8863788a986e11d564c98af0de89def47c83193c.tar.gz luarocks-8863788a986e11d564c98af0de89def47c83193c.tar.bz2 luarocks-8863788a986e11d564c98af0de89def47c83193c.zip |
Merge changes proposed by @siffiejoe in #172.
(Sorry about the clumsiness of not doing a proper merge.)
Diffstat (limited to 'src/bin')
-rwxr-xr-x | src/bin/luarocks | 1 | ||||
-rwxr-xr-x | src/bin/luarocks-admin | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/bin/luarocks b/src/bin/luarocks index e28b17b8..6ab27fa3 100755 --- a/src/bin/luarocks +++ b/src/bin/luarocks | |||
@@ -1,5 +1,6 @@ | |||
1 | #!/usr/bin/env lua | 1 | #!/usr/bin/env lua |
2 | 2 | ||
3 | local loader = require("luarocks.loader") | ||
3 | local command_line = require("luarocks.command_line") | 4 | local command_line = require("luarocks.command_line") |
4 | 5 | ||
5 | program_description = "LuaRocks main command-line interface" | 6 | program_description = "LuaRocks main command-line interface" |
diff --git a/src/bin/luarocks-admin b/src/bin/luarocks-admin index 4c5613ca..983dda87 100755 --- a/src/bin/luarocks-admin +++ b/src/bin/luarocks-admin | |||
@@ -1,5 +1,6 @@ | |||
1 | #!/usr/bin/env lua | 1 | #!/usr/bin/env lua |
2 | 2 | ||
3 | local loader = require("luarocks.loader") | ||
3 | local command_line = require("luarocks.command_line") | 4 | local command_line = require("luarocks.command_line") |
4 | 5 | ||
5 | program_description = "LuaRocks repository administration interface" | 6 | program_description = "LuaRocks repository administration interface" |