Honor --force-config

2 files changed, 14 insertions, 8 deletions

diff --git a/GNUmakefile b/GNUmakefile
index 86f965a7..90ceaf87 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -76,7 +76,9 @@ luarocks-admin: config.unix
 $(builddir)/luarocks: src/bin/luarocks config.unix
         mkdir -p "$(@D)"
         (printf '$(SHEBANG)\n'\
-        'package.loaded["luarocks.core.hardcoded"] = { SYSCONFDIR = [[$(luarocksconfdir)]] }\n'\
+        'package.loaded["luarocks.core.hardcoded"] = { '\
+        "$$([ -n "$(FORCE_CONFIG)" ] && printf 'FORCE_CONFIG = true, ')"\
+        'SYSCONFDIR = [[$(luarocksconfdir)]] }\n'\
         'package.path=[[$(luadir)/?.lua;]] .. package.path\n'; \
         tail -n +2 src/bin/luarocks \
         )> "$@"
@@ -84,7 +86,9 @@ $(builddir)/luarocks: src/bin/luarocks config.unix
 $(builddir)/luarocks-admin: src/bin/luarocks-admin config.unix
         mkdir -p "$(@D)"
         (printf '$(SHEBANG)\n'\
-        'package.loaded["luarocks.core.hardcoded"] = { SYSCONFDIR = [[$(luarocksconfdir)]] }\n'\
+        'package.loaded["luarocks.core.hardcoded"] = { '\
+        "$$([ -n "$(FORCE_CONFIG)" ] && printf 'FORCE_CONFIG = true, ')"\
+        'SYSCONFDIR = [[$(luarocksconfdir)]] }\n'\
         'package.path=[[$(luadir)/?.lua;]] .. package.path\n'; \
         tail -n +2 src/bin/luarocks-admin \
         )> "$@"
@@ -97,11 +101,11 @@ binary: luarocks $(buildbinarydir)/luarocks.exe $(buildbinarydir)/luarocks-admin
 
 $(buildbinarydir)/luarocks.exe: src/bin/luarocks $(LUAROCKS_FILES)
         (unset $(LUA_ENV_VARS); \
-        "$(LUA)" binary/all_in_one "$<" "$(LUA_DIR)" "^src/luarocks/admin/" "$(luarocksconfdir)" "$(@D)" $(BINARY_PLATFORM) $(CC) $(NM) $(SYSROOT))
+        "$(LUA)" binary/all_in_one "$<" "$(LUA_DIR)" "^src/luarocks/admin/" "$(luarocksconfdir)" "$(@D)" "$(FORCE_CONFIG)" $(BINARY_PLATFORM) $(CC) $(NM) $(SYSROOT))
 
 $(buildbinarydir)/luarocks-admin.exe: src/bin/luarocks-admin $(LUAROCKS_FILES)
         (unset $(LUA_ENV_VARS); \
-        "$(LUA)" binary/all_in_one "$<" "$(LUA_DIR)" "^src/luarocks/cmd/" "$(luarocksconfdir)" "$(@D)" $(BINARY_PLATFORM) $(CC) $(NM) $(SYSROOT))
+        "$(LUA)" binary/all_in_one "$<" "$(LUA_DIR)" "^src/luarocks/cmd/" "$(luarocksconfdir)" "$(@D)" "$(FORCE_CONFIG)" $(BINARY_PLATFORM) $(CC) $(NM) $(SYSROOT))
 
 # ----------------------------------------
 # Regular install
diff --git a/binary/all_in_one b/binary/all_in_one
index d6517d79..01758758 100755
--- a/binary/all_in_one
+++ b/binary/all_in_one
@@ -30,10 +30,11 @@ local LUA_DIR = arg[2] or "/usr"
 local EXCLUDE = arg[3] or "^src/luarocks/admin/"
 local SYSCONFDIR = arg[4] or "/etc/luarocks"
 local TARGET = arg[5] or "build-binary"
-local MY_PLATFORM = arg[6] or "unix"
-local CC = arg[7] or "gcc"
-local NM = arg[8] or "nm"
-local CROSSCOMPILER_SYSROOT = arg[9] or "/usr/lib/mingw-w64-sysroot/i686-w64-mingw32"
+local FORCE_CONFIG = (arg[6] == "yes")
+local MY_PLATFORM = arg[7] or "unix"
+local CC = arg[8] or "gcc"
+local NM = arg[9] or "nm"
+local CROSSCOMPILER_SYSROOT = arg[10] or "/usr/lib/mingw-w64-sysroot/i686-w64-mingw32"
 
 local LUA_MODULES = TARGET .. "/lua_modules"
 local CONFIG_DIR = TARGET .. "/.luarocks"
@@ -158,6 +159,7 @@ local function write_hardcoded_module(dir)
    local hardcoded = {
       SYSTEM = system,
       PROCESSOR = processor,
+      FORCE_CONFIG = FORCE_CONFIG,
 
       SYSCONFDIR = if_platform("unix", SYSCONFDIR),