minor fixes

git-svn-id: http://luarocks.org/svn/luarocks/trunk@10 9ca3f7c1-7366-0410-b1a3-b5c78f85698c

4 files changed, 9 insertions, 8 deletions

diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index b667f8e7..d0de70cc 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -1,6 +1,6 @@
 
-local rawset, next, table, pairs, print, require, io, os, setmetatable, program_version =
-      rawset, next, table, pairs, print, require, io, os, setmetatable, program_version
+local rawset, next, table, pairs, print, require, io, os, setmetatable =
+      rawset, next, table, pairs, print, require, io, os, setmetatable
 
 --- Configuration for LuaRocks.
 -- Tries to load the user's configuration file and
@@ -9,6 +9,8 @@ local rawset, next, table, pairs, print, require, io, os, setmetatable, program_
 -- file format documentation</a> for details.
 module("luarocks.cfg")
 
+program_version = "1.1"
+
 local persist = require("luarocks.persist")
 
 local detected = {}
diff --git a/src/luarocks/command_line.lua b/src/luarocks/command_line.lua
index e220bb34..9688343e 100644
--- a/src/luarocks/command_line.lua
+++ b/src/luarocks/command_line.lua
@@ -1,6 +1,4 @@
 
-program_version = "1.1"
-
 --- Functions for command-line scripts.
 module("luarocks.command_line", package.seeall)
 
@@ -15,7 +13,7 @@ local function die(message)
 
    local ok, err = pcall(util.run_scheduled_functions)
    if not ok then
-      print("\nLuaRocks "..program_version.." internal bug (please report at luarocks-developers@lists.luaforge.net):\n"..err)
+      print("\nLuaRocks "..cfg.program_version.." internal bug (please report at luarocks-developers@lists.luaforge.net):\n"..err)
    end
    print("\nError: "..message)
    os.exit(1)
@@ -92,7 +90,7 @@ function run_command(...)
    local command
    
    if flags["version"] then
-      print(program_name.." "..program_version)
+      print(program_name.." "..cfg.program_version)
       print(program_description)
       print()
       os.exit(0)
diff --git a/src/luarocks/help.lua b/src/luarocks/help.lua
index 76e77a33..04fea7ce 100644
--- a/src/luarocks/help.lua
+++ b/src/luarocks/help.lua
@@ -7,6 +7,7 @@
 module("luarocks.help", package.seeall)
 
 local util = require("luarocks.util")
+local cfg = require("luarocks.cfg")
 
 help_summary = "Help on commands."
 
@@ -25,7 +26,7 @@ function run(...)
 
    if not command then
       print([[
-LuaRocks ]]..program_version..[[, a module deployment system for Lua
+LuaRocks ]]..cfg.program_version..[[, a module deployment system for Lua
 
 ]]..program_name..[[ - ]]..program_description..[[
 
diff --git a/src/luarocks/require.lua b/src/luarocks/require.lua
index f5d26078..21d6511a 100644
--- a/src/luarocks/require.lua
+++ b/src/luarocks/require.lua
@@ -13,7 +13,7 @@ local package, assert, ipairs, pairs, os, print, table, type, next =
 module("luarocks.require")
 
 local path = plain_require("luarocks.path")
-local manif = plain_require("luarocks.manif")
+local manif = plain_require("luarocks.manif_core")
 local deps = plain_require("luarocks.deps")
 local cfg = plain_require("luarocks.cfg")