diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2015-12-01 15:07:51 -0200 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2015-12-01 15:07:51 -0200 |
| commit | 334e8b5126864f0d0a5a34ce6953a44ef7eefc51 (patch) | |
| tree | 5978ff35ad50e3e19483d63ff49bf111cdd3a733 /src | |
| parent | 4bf9303acaa02ce9361ac814a7b093ff6d11acba (diff) | |
| parent | 9b249227220ea01c3ae40b4e3491f031a5307194 (diff) | |
| download | luarocks-334e8b5126864f0d0a5a34ce6953a44ef7eefc51.tar.gz luarocks-334e8b5126864f0d0a5a34ce6953a44ef7eefc51.tar.bz2 luarocks-334e8b5126864f0d0a5a34ce6953a44ef7eefc51.zip | |
Merge pull request #453 from Tieske/default_config_location
write config directory only if explictly given, use defaults otherwise
Diffstat (limited to 'src')
| -rw-r--r-- | src/luarocks/cfg.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua index a22cf121..e41b632c 100644 --- a/src/luarocks/cfg.lua +++ b/src/luarocks/cfg.lua | |||
| @@ -149,7 +149,7 @@ local sys_config_file_default, home_config_file_default | |||
| 149 | local sys_config_dir, home_config_dir | 149 | local sys_config_dir, home_config_dir |
| 150 | local sys_config_ok, home_config_ok = false, false | 150 | local sys_config_ok, home_config_ok = false, false |
| 151 | local extra_luarocks_module_dir | 151 | local extra_luarocks_module_dir |
| 152 | sys_config_dir = site_config.LUAROCKS_SYSCONFDIR | 152 | sys_config_dir = site_config.LUAROCKS_SYSCONFDIR or site_config.LUAROCKS_PREFIX |
| 153 | if cfg.platforms.windows then | 153 | if cfg.platforms.windows then |
| 154 | cfg.home = os.getenv("APPDATA") or "c:" | 154 | cfg.home = os.getenv("APPDATA") or "c:" |
| 155 | sys_config_dir = sys_config_dir or "c:/luarocks" | 155 | sys_config_dir = sys_config_dir or "c:/luarocks" |