Merge branch 'master' into luarocks-3

6 files changed, 102 insertions, 110 deletions

diff --git a/.appveyor/build.bat b/.appveyor/build.bat
index 48e72514..a4ff6378 100644
--- a/.appveyor/build.bat
+++ b/.appveyor/build.bat
@@ -18,9 +18,8 @@ if not defined LUAROCKS_VER set LUAROCKS_VER=2.2.1
 set LUAROCKS_SHORTV=%LUAROCKS_VER:~0,3%
 
 if not defined LR_EXTERNAL set LR_EXTERNAL=c:\external
-if not defined LUAROCKS_INSTALL set LUAROCKS_INSTALL=%LUA_DIR%\LuaRocks
-if not defined LR_ROOT set LR_ROOT=%LUAROCKS_INSTALL%\%LUAROCKS_SHORTV%
-if not defined LR_SYSTREE set LR_SYSTREE=%LUAROCKS_INSTALL%\systree
+if not defined LR_ROOT set LR_ROOT=%LUA_DIR%\LuaRocks
+if not defined LR_SYSTREE set LR_SYSTREE=%LR_ROOT%\systree
 
 ::
 :: =========================================================
@@ -35,7 +34,7 @@ if not exist %LUA_DIR%\bin\%LUA%.exe call :die "Missing Lua interpreter at %LUA_
 :: =========================================================
 
 cd %APPVEYOR_BUILD_FOLDER%
-call install.bat /LUA %LUA_DIR% /Q /LV %LUA_SHORTV% /P "%LUAROCKS_INSTALL%" /TREE "%LR_SYSTREE%"
+call install.bat /LUA %LUA_DIR% /Q /LV %LUA_SHORTV% /P "%LR_ROOT%" /TREE "%LR_SYSTREE%"
 
 if not exist "%LR_ROOT%" call :die "LuaRocks not found at %LR_ROOT%"
 
diff --git a/configure b/configure
index bd962edf..8b99b2ae 100755
--- a/configure
+++ b/configure
@@ -71,26 +71,7 @@ EOF
 # Helper functions
 
 find_program() {
-   path="$PATH"
-   item="`echo "$path" | sed 's/\([^:]*\):.*/\1/'`"
-   path="`echo "$path" | sed -n 's/[^:]*::*\(.*\)/\1/p'`"
-   found="no"
-   while [ -n "$item" ]
-   do
-      if [ -f "$item/$1" ]
-      then
-         found="yes"
-         break
-      fi
-      item="`echo "$path" | sed 's/\([^:]*\):.*/\1/'`"
-      path="`echo "$path" | sed -n 's/[^:]*::*\(.*\)/\1/p'`"
-   done
-   if [ "$found" = "yes" ]
-   then
-      echo "$item"
-   else
-      echo ""
-   fi
+    command -v "$1" 2>/dev/null
 }
 
 die() {
diff --git a/install.bat b/install.bat
index 57e3611c..42b01c43 100644
--- a/install.bat
+++ b/install.bat
@@ -8,6 +8,7 @@ local vars = {}
 vars.PREFIX = nil

 vars.VERSION = "2.2"

 vars.SYSCONFDIR = nil

+vars.CONFBACKUPDIR = nil

 vars.SYSCONFFILENAME = nil

 vars.CONFIG_FILE = nil

 vars.TREE_ROOT = nil

@@ -79,7 +80,7 @@ end
 

 local function exec(cmd)

         --print(cmd)

-        local status = os.execute(cmd)

+        local status = os.execute("type NUL && "..cmd)

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

 end

 

@@ -97,7 +98,7 @@ local function permission()
         return exec("net session >NUL 2>&1") -- fails if not admin

 end

 

--- rename file (full path) to backup (name only), appending number if required

+-- rename filename (full path) to backupname (name only), appending number if required

 -- returns the new name (name only)

 local function backup(filename, backupname)

         local path = filename:match("(.+)%\\.-$").."\\"

@@ -121,14 +122,12 @@ local function print_help()
 Installs LuaRocks.

 

 /P [dir]       Where to install LuaRocks. 

-               Note that version; $VERSION, will be appended to this

-               path, so "/P c:\luarocks\" will install in 

-               "c:\luarocks\$VERSION\"

                Default is %PROGRAMFILES%\LuaRocks

 

 Configuring the destinations:

-/TREE [dir]    Root of the local tree of installed rocks.

-               Default is %PROGRAMFILES%\LuaRocks\systree

+/TREE [dir]    Root of the local system tree of installed rocks.

+               Default is {BIN}\..\ if {BIN} ends with '\bin'

+               otherwise it is {BIN}\systree. 

 /SCRIPTS [dir] Where to install commandline scripts installed by

                rocks. Default is {TREE}\bin.

 /LUAMOD [dir]  Where to install Lua modules installed by rocks.

@@ -255,7 +254,7 @@ local function check_flags()
                         die("Cannot combine option /L with any of /LUA /BIN /LIB /INC")

                 end

                 if vars.LUA_VERSION ~= "5.1" then

-                        die("Bundled Lua version is 5.1, cannot install 5.2")

+                        die("Bundled Lua version is 5.1, cannot install "..vars.LUA_VERSION)

                 end

         end

         if vars.LUA_VERSION ~= "5.1" then

@@ -479,6 +478,28 @@ local function look_for_lua_install ()
         return false

 end

 

+-- backup config[x.x].lua[.bak] and site_config[_x_x].lua

+local function backup_config_files()

+  local temppath

+  while not temppath do

+    temppath = os.getenv("temp").."\\LR-config-backup-"..tostring(math.random(10000))

+    if exists(temppath) then temppath = nil end

+  end

+  vars.CONFBACKUPDIR = temppath

+  mkdir(vars.CONFBACKUPDIR)

+  exec(S[[COPY "$PREFIX\config*.*" "$CONFBACKUPDIR" >NUL]])

+  exec(S[[COPY "$PREFIX\lua\luarocks\site_config*.*" "$CONFBACKUPDIR" >NUL]])

+end

+

+-- restore previously backed up config files

+local function restore_config_files()

+  if not vars.CONFBACKUPDIR then return end -- there is no backup to restore

+  exec(S[[COPY "$CONFBACKUPDIR\config*.*" "$PREFIX" >NUL]])

+  exec(S[[COPY "$CONFBACKUPDIR\site_config*.*" "$PREFIX\lua\luarocks" >NUL]])

+  -- cleanup

+  exec(S[[RD /S /Q "$CONFBACKUPDIR"]])

+  vars.CONFBACKUPDIR = nil

+end

 

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

 -- Installer script start

@@ -586,11 +607,10 @@ else
 end

 

 vars.PREFIX = vars.PREFIX or os.getenv("PROGRAMFILES")..[[\LuaRocks]]

-vars.FULL_PREFIX = S"$PREFIX\\$VERSION"

-vars.BINDIR = vars.FULL_PREFIX

-vars.LIBDIR = vars.FULL_PREFIX

-vars.LUADIR = S"$FULL_PREFIX\\lua"

-vars.INCDIR = S"$FULL_PREFIX\\include"

+vars.BINDIR = vars.PREFIX

+vars.LIBDIR = vars.PREFIX

+vars.LUADIR = S"$PREFIX\\lua"

+vars.INCDIR = S"$PREFIX\\include"

 vars.LUA_SHORTV = vars.LUA_VERSION:gsub("%.", "")

 

 if INSTALL_LUA then

@@ -611,17 +631,23 @@ else
     vars.UNAME_M = get_architecture()  -- can only do when installation was found

 end

 

-local datapath

-if vars.UNAME_M == "x86" then

-        datapath = os.getenv("PROGRAMFILES") .. [[\LuaRocks]]

-else

-        -- our target interpreter is 64bit, so the tree (with binaries) should go into 64bit program files

-        datapath = os.getenv("ProgramW6432") .. [[\LuaRocks]]

+-- check location of system tree

+if not vars.TREE_ROOT then

+  -- no system tree location given, so we need to construct a default value

+  if vars.LUA_BINDIR:lower():match([[([\/]+bin[\/]*)$]]) then

+    -- lua binary is located in a 'bin' subdirectory, so assume

+    -- default Lua layout and match rocktree on top

+    vars.TREE_ROOT = vars.LUA_BINDIR:lower():gsub([[[\/]+bin[\/]*$]], [[\]])

+  else

+    -- no 'bin', so use a named tree next to the Lua executable

+    vars.TREE_ROOT = vars.LUA_BINDIR .. [[\systree]]

+  end

 end

+

+local datapath

 vars.SYSCONFDIR = vars.SYSCONFDIR or vars.PREFIX

 vars.SYSCONFFILENAME = S"config-$LUA_VERSION.lua"

 vars.CONFIG_FILE = vars.SYSCONFDIR.."\\"..vars.SYSCONFFILENAME

-vars.TREE_ROOT = vars.TREE_ROOT or datapath..[[\systree]]

 if SELFCONTAINED then

         vars.SYSCONFDIR = vars.PREFIX

         vars.TREE_ROOT = vars.PREFIX..[[\systree]]

@@ -635,7 +661,7 @@ print(S[[
 ==========================

 

 Will configure LuaRocks with the following paths:

-LuaRocks        : $FULL_PREFIX

+LuaRocks        : $PREFIX

 Config file     : $CONFIG_FILE

 Rocktree        : $TREE_ROOT

 

@@ -664,17 +690,19 @@ print([[
 -- ***********************************************************

 -- Install LuaRocks files

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

-if FORCE then

-        print(S"Removing $FULL_PREFIX...")

-        exec(S[[RD /S /Q "$FULL_PREFIX"]])

-        print()

-end

 

-if exists(vars.FULL_PREFIX) then

-        die(S"$FULL_PREFIX exists. Use /F to force removal and reinstallation.")

+if exists(vars.PREFIX) then

+  if not FORCE then

+    die(S"$PREFIX exists. Use /F to force removal and reinstallation.")

+  else

+    backup_config_files()

+    print(S"Removing $PREFIX...")

+    exec(S[[RD /S /Q "$PREFIX"]])

+    print()

+  end

 end

 

-print(S"Installing LuaRocks in $FULL_PREFIX...")

+print(S"Installing LuaRocks in $PREFIX...")

 if not exists(vars.BINDIR) then

         if not mkdir(vars.BINDIR) then

                 die()

@@ -776,37 +804,21 @@ exit /b %EXITCODE%
         print(S"Created LuaRocks command: $BINDIR\\"..c..".bat")

 end

 

--- part below was commented out as its purpose was unclear

--- see https://github.com/keplerproject/luarocks/pull/197#issuecomment-30176548

-

--- configure 'scripts' directory

--- if vars.TREE_BIN then

---      mkdir(vars.TREE_BIN)

---      if not USE_MINGW then

---              -- definitly not for MinGW because of conflicting runtimes

---              -- but is it ok to do it for others???

---              exec(S[[COPY lua5.1\bin\*.dll "$TREE_BIN" >NUL]])

---      end

--- else

---      if not USE_MINGW then

---      mkdir(S[[$TREE_ROOT\bin]])

---              -- definitly not for MinGW because of conflicting runtimes

---              -- but is it ok to do it for others???

---              exec(S[[COPY lua5.1\bin\*.dll "$TREE_ROOT"\bin >NUL]])

---      end

--- end

-

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

 -- Configure LuaRocks

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

 

+restore_config_files()

 print()

 print("Configuring LuaRocks...")

 

 -- Create a site-config file

 local site_config = S("site_config_$LUA_VERSION"):gsub("%.","_")

 if exists(S([[$LUADIR\luarocks\]]..site_config..[[.lua]])) then

-        exec(S([[RENAME "$LUADIR\luarocks\]]..site_config..[[.lua" site_config.lua.bak]]))

+        local nname = backup(S([[$LUADIR\luarocks\]]..site_config..[[.lua]]), site_config..".lua.bak")

+        print("***************")

+        print("*** WARNING *** LuaRocks site_config file already exists: '"..site_config..".lua'. The old file has been renamed to '"..nname.."'")

+        print("***************")

 end

 local f = io.open(vars.LUADIR.."\\luarocks\\"..site_config..".lua", "w")

 f:write(S[=[

@@ -832,13 +844,6 @@ site_config.LUAROCKS_MD5CHECKER=[[md5sum]]
 if FORCE_CONFIG then

         f:write("site_config.LUAROCKS_FORCE_CONFIG=true\n")

 end

-if exists(vars.LUADIR.."\\luarocks\\"..site_config..".lua.bak") then

-        for line in io.lines(vars.LUADIR.."\\luarocks\\"..site_config..".lua.bak", "r") do

-                f:write(line)

-                f:write("\n")

-        end

-        exec(S([[DEL /F /Q "$LUADIR\luarocks\]]..site_config..[[.lua.bak"]]))

-end

 f:write("return site_config\n")

 f:close()

 print(S([[Created LuaRocks site-config file: $LUADIR\luarocks\]]..site_config..[[.lua]]))

@@ -913,17 +918,17 @@ if REGISTRY then
         -- expand template with correct path information

         print()

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

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

-        exec( S[[regedit /S "$FULL_PREFIX\\LuaRocks.reg"]] )

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

+        exec( S[[regedit /S "$PREFIX\\LuaRocks.reg"]] )

 end

 

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

 -- Cleanup

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

 -- remove regsitry related files, no longer needed

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

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

 -- remove pe-parser module

-exec( S[[del "$FULL_PREFIX\pe-parser.lua" >NUL]] )

+exec( S[[del "$PREFIX\pe-parser.lua" >NUL]] )

 

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

 -- Exit handlers 

@@ -943,8 +948,8 @@ Lua interpreter;
   PATH     :   $LUA_BINDIR

   PATHEXT  :   .LUA

 LuaRocks;

-  PATH     :   $FULL_PREFIX

-  LUA_PATH :   $FULL_PREFIX\lua\?.lua;$FULL_PREFIX\lua\?\init.lua

+  PATH     :   $PREFIX

+  LUA_PATH :   $PREFIX\lua\?.lua;$PREFIX\lua\?\init.lua

 Local user rocktree (Note: %APPDATA% is user dependent);

   PATH     :   %APPDATA%\LuaRocks\bin

   LUA_PATH :   %APPDATA%\LuaRocks\share\lua\$LUA_VERSION\?.lua;%APPDATA%\LuaRocks\share\lua\$LUA_VERSION\?\init.lua

diff --git a/makedist b/makedist
index 482c77f7..1a9ca992 100755
--- a/makedist
+++ b/makedist
@@ -61,14 +61,14 @@ mkdir "release-windows"
 mv "$out" "release-windows/$out-win32"
 
 cd "release-unix/$out"
-rm -rf makedist install.bat COPYING_lua COPYING_7z COPYING_win win32 lfw .travis.yml .gitignore
+rm -rf makedist install.bat COPYING_lua COPYING_7z COPYING_win win32 lfw .travis.yml .gitignore appveyor* .appveyor
 cd ..
 tar czvpf ../"$out.tar.gz" "$out"
 cd ..
 rm -rf "release-unix"
 
 cd "release-windows/$out-win32"
-rm -rf makedist Makefile* configure lfw .travis.yml .gitignore test
+rm -rf makedist Makefile* configure lfw .travis.yml .gitignore test appveyor* .appveyor
 cd ..
 zip -r ../"$out-win32.zip" "$out-win32"
 cd ..
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index ec9a9829..4fb1b23b 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -228,24 +228,31 @@ end
 if not site_config.LUAROCKS_FORCE_CONFIG then
   
    home_config_file_default = home_config_dir.."/config-"..cfg.lua_version..".lua"
-
+   
    local config_env_var   = "LUAROCKS_CONFIG_" .. version_suffix
    local config_env_value = os.getenv(config_env_var)
    if not config_env_value then
       config_env_var   = "LUAROCKS_CONFIG"
       config_env_value = os.getenv(config_env_var)
    end
-   if config_env_value then
-      home_config_ok = load_config_file({ config_env_value })
+   
+   -- first try environment provided file, so we can explicitly warn when it is missing
+   if config_env_value then 
+      local list = { config_env_value }
+      home_config_file = load_config_file(list)
+      home_config_ok = (home_config_file ~= nil)
       if not home_config_ok then
-         io.stderr:write("Warning: could not load file "..config_env_value.." given in environment variable "..config_env_var)
+         io.stderr:write("Warning: could not load configuration file `"..config_env_value.."` given in environment variable "..config_env_var.."\n")
       end
-      home_config_file = config_env_var
-   else
-      home_config_file = load_config_file({
+   end
+
+   -- try the alternative defaults if there was no environment specified file or it didn't work
+   if not home_config_ok then
+      local list = {
          home_config_file_default,
          home_config_dir.."/config.lua",
-      })
+      }
+      home_config_file = load_config_file(list)
       home_config_ok = (home_config_file ~= nil)
    end
 end
@@ -385,7 +392,7 @@ local defaults = {
 }
 
 if cfg.platforms.windows then
-   local full_prefix = (site_config.LUAROCKS_PREFIX or (os.getenv("PROGRAMFILES")..[[\LuaRocks]])).."\\"..cfg.major_version
+   local full_prefix = (site_config.LUAROCKS_PREFIX or (os.getenv("PROGRAMFILES")..[[\LuaRocks]]))
    extra_luarocks_module_dir = full_prefix.."\\lua\\?.lua"
 
    home_config_file = home_config_file and home_config_file:gsub("\\","/")
diff --git a/src/luarocks/tools/patch.lua b/src/luarocks/tools/patch.lua
index b53bad61..debaf636 100644
--- a/src/luarocks/tools/patch.lua
+++ b/src/luarocks/tools/patch.lua
@@ -200,8 +200,13 @@ function patch.read_patch(filename, data)
     if state == 'hunkbody' then
       -- skip hunkskip and hunkbody code until definition of hunkhead read
 
+      if line:match"^[\r\n]*$" then
+          -- prepend space to empty lines to interpret them as context properly
+          line = " " .. line
+      end
+
       -- process line first
-      if line:match"^[- +\\]" or line:match"^[\r\n]*$" then
+      if line:match"^[- +\\]" then
           -- gather stats about line endings
           local he = files.hunkends[nextfileno]
           if endswith(line, "\r\n") then
@@ -455,16 +460,15 @@ local function find_hunks(file, hunks)
 end
 
 local function check_patched(file, hunks)
-  local matched = true
   local lineno = 1
   local ok, err = pcall(function()
     if #file == 0 then
-      error 'nomatch'
+      error('nomatch', 0)
     end
     for hno, h in ipairs(hunks) do
       -- skip to line just before hunk starts
       if #file < h.starttgt then
-         error 'nomatch'
+        error('nomatch', 0)
       end
       lineno = h.starttgt
       for _, hline in ipairs(h.text) do
@@ -473,22 +477,18 @@ local function check_patched(file, hunks)
           local line = file[lineno]
           lineno = lineno + 1
           if #line == 0 then
-            error 'nomatch'
+            error('nomatch', 0)
           end
           if endlstrip(line) ~= endlstrip(hline:sub(2)) then
             warning(format("file is not patched - failed hunk: %d", hno))
-            error 'nomatch'
+            error('nomatch', 0)
           end
         end
       end
     end
   end)
-  if err == 'nomatch' then
-    matched = false
-  end
-    -- todo: display failed hunk, i.e. expected/found
-
-  return matched
+  -- todo: display failed hunk, i.e. expected/found
+  return err ~= 'nomatch'
 end
 
 local function patch_hunks(srcname, tgtname, hunks)