From a625fe26e46fa0c61c1fbab82013589813ebf4c4 Mon Sep 17 00:00:00 2001 From: Thijs Schreijer Date: Mon, 20 Jul 2015 15:41:34 +0200 Subject: fixed bad reference to main LuaRocks install path, should fix AppVeyor failures --- .appveyor/build.bat | 1 - src/luarocks/cfg.lua | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.appveyor/build.bat b/.appveyor/build.bat index 9bec8c54..a4ff6378 100644 --- a/.appveyor/build.bat +++ b/.appveyor/build.bat @@ -47,7 +47,6 @@ set LUA_PATH=%LUA_PATH%;%LR_SYSTREE%\share\lua\%LUA_SHORTV%\?\init.lua set LUA_CPATH=%LR_SYSTREE%\lib\lua\%LUA_SHORTV%\?.dll call luarocks --version || call :die "Error with LuaRocks installation" -cd && dir call luarocks list diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua index 31b3211a..70c1bd04 100644 --- a/src/luarocks/cfg.lua +++ b/src/luarocks/cfg.lua @@ -374,7 +374,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("\\","/") -- cgit v1.2.3-55-g6feb