Merge remote-tracking branch 'upstream/master' into linux-multiarch

2 files changed, 4 insertions, 2 deletions

diff --git a/install.bat b/install.bat
index abf680a4..99dc7fa7 100644
--- a/install.bat
+++ b/install.bat
@@ -40,7 +40,7 @@ end
 local function exec(cmd)

         --print(cmd)

         local status = os.execute(cmd)

-        return status == 0

+        return (status == 0 or status == true) -- compat 5.1/5.2

 end

 

 local function exists(filename)

@@ -629,9 +629,11 @@ if REGISTRY then
         -- expand template with correct path information

         print()

         print([[Loading registry information for ".rockspec" files]])

-        exec( S[[lua5.1\bin\lua5.1.exe "$FULL_PREFIX\create_reg_file.lua" "$FULL_PREFIX\LuaRocks.reg.template"]] )

+        exec( S[[lua5.1\bin\lua5.1.exe "$FULL_PREFIX\LuaRocks.reg.lua" "$FULL_PREFIX\LuaRocks.reg.template"]] )

         exec( S"$FULL_PREFIX\\LuaRocks.reg" )

 end

+-- remove regsitry related files, no longer needed

+exec( S[[del "$FULL_PREFIX\LuaRocks.reg.*" > nul]] )

 

 -- ***********************************************************

 -- Exit handlers 

diff --git a/win32/bin/create_reg_file.lua b/win32/bin/LuaRocks.reg.lua
index 2eb7583a..2eb7583a 100644
--- a/win32/bin/create_reg_file.lua
+++ b/win32/bin/LuaRocks.reg.lua