Merge branch 'master' into 2.3.0v2.3.0-rc2v2.3.0

2 files changed, 2 insertions, 1 deletions

diff --git a/install.bat b/install.bat
index ee8626f9..8563f2da 100644
--- a/install.bat
+++ b/install.bat
@@ -983,7 +983,7 @@ if FORCE_CONFIG then
         f:write("site_config.LUAROCKS_FORCE_CONFIG=true\n")

 end

 if vars.SYSCONFFORCE then  -- only write this value when explcitly given, otherwise rely on defaults

-        f:write("site_config.LUAROCKS_SYSCONFIG=[[$CONFIG_FILE]]\n")

+        f:write(S("site_config.LUAROCKS_SYSCONFIG=[[$CONFIG_FILE]]\n"))

 end

 f:write("return site_config\n")

 f:close()

diff --git a/test/testing.sh b/test/testing.sh
index 26bdde5f..70bd68b2 100755
--- a/test/testing.sh
+++ b/test/testing.sh
@@ -244,6 +244,7 @@ mkdir -p "$testing_server"
    get "$luarocks_repo/validate-args-1.5.4-1.rockspec"
    get "$luarocks_repo/luasec-0.5-2.rockspec"
    get "$luarocks_repo/luabitop-1.0.2-1.rockspec"
+   get "$luarocks_repo/luabitop-1.0.2-1.src.rock"
    get "$luarocks_repo/lpty-1.0.1-1.src.rock"
    get "$luarocks_repo/cprint-${verrev_cprint}.src.rock"
    get "$luarocks_repo/cprint-${verrev_cprint}.rockspec"