aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThijs Schreijer <thijs@thijsschreijer.nl>2015-07-20 15:41:34 +0200
committerThijs Schreijer <thijs@thijsschreijer.nl>2015-07-20 15:41:34 +0200
commita625fe26e46fa0c61c1fbab82013589813ebf4c4 (patch)
treed1604143f4dd67b7b83352f9b935dd851a7c9541
parent838f1f9057e0066695b4f0fc762253b696025f92 (diff)
downloadluarocks-a625fe26e46fa0c61c1fbab82013589813ebf4c4.tar.gz
luarocks-a625fe26e46fa0c61c1fbab82013589813ebf4c4.tar.bz2
luarocks-a625fe26e46fa0c61c1fbab82013589813ebf4c4.zip
fixed bad reference to main LuaRocks install path, should fix AppVeyor failures
-rw-r--r--.appveyor/build.bat1
-rw-r--r--src/luarocks/cfg.lua2
2 files changed, 1 insertions, 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
47set LUA_CPATH=%LR_SYSTREE%\lib\lua\%LUA_SHORTV%\?.dll 47set LUA_CPATH=%LR_SYSTREE%\lib\lua\%LUA_SHORTV%\?.dll
48 48
49call luarocks --version || call :die "Error with LuaRocks installation" 49call luarocks --version || call :die "Error with LuaRocks installation"
50cd && dir
51call luarocks list 50call luarocks list
52 51
53 52
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 = {
374} 374}
375 375
376if cfg.platforms.windows then 376if cfg.platforms.windows then
377 local full_prefix = (site_config.LUAROCKS_PREFIX or (os.getenv("PROGRAMFILES")..[[\LuaRocks]])).."\\"..cfg.major_version 377 local full_prefix = (site_config.LUAROCKS_PREFIX or (os.getenv("PROGRAMFILES")..[[\LuaRocks]]))
378 extra_luarocks_module_dir = full_prefix.."\\lua\\?.lua" 378 extra_luarocks_module_dir = full_prefix.."\\lua\\?.lua"
379 379
380 home_config_file = home_config_file and home_config_file:gsub("\\","/") 380 home_config_file = home_config_file and home_config_file:gsub("\\","/")