2 files changed, 4 insertions, 4 deletions

diff --git a/src/luarocks/cmd.lua b/src/luarocks/cmd.lua
index be749c16..9255cff8 100644
--- a/src/luarocks/cmd.lua
+++ b/src/luarocks/cmd.lua
@@ -85,7 +85,7 @@ do
             replace_tree(args, root_dir)
          end
       elseif args["local"] then
-         if not cfg.home_tree then
+         if os.getenv("USER") == "root" then
             return nil, "The --local flag is meant for operating in a user's home directory.\n"..
                "You are running as a superuser, which is intended for system-wide operation.\n"..
                "To force using the superuser's home, use --tree explicitly."
@@ -642,7 +642,7 @@ function cmd.run_command(description, commands, external_namespace, ...)
    end
 
    -- if running as superuser, use system cache dir
-   if not cfg.home_tree then
+   if os.getenv("USER") == "root" then
       cfg.local_cache = dir.path(fs.system_cache_dir(), "luarocks")
    end
 
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
index c19f7d3b..b2b26fad 100644
--- a/src/luarocks/core/cfg.lua
+++ b/src/luarocks/core/cfg.lua
@@ -86,8 +86,8 @@ local function set_confdirs(cfg, platforms, hardcoded_sysconfdir)
          sysconfdir = detect_sysconfdir()
       end
       cfg.home = os.getenv("HOME") or ""
-      cfg.home_tree = (os.getenv("USER") ~= "root") and cfg.home.."/.luarocks"
-      cfg.homeconfdir = cfg.home.."/.luarocks"
+      cfg.home_tree = cfg.home.."/.luarocks"
+      cfg.homeconfdir = cfg.home_tree
       cfg.sysconfdir = sysconfdir or "/etc/luarocks"
    end
 end