judge: use new config path by default

This commit is contained in:
undefined committed 2022-11-10 19:37:45 +08:00
1 parent f80c3426fc
commit 489a374445
4 files changed
+71 -20

No files matched your search

+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@hydrooj/hydrojudge",
"bin": "bin/hydrojudge.js",
"version": "3.1.4",
"version": "3.1.5",
"main": "package.json",
"author": "undefined <i@undefined.moe>",
"repository": "https://github.com/hydro-dev/Hydro.git",
+4 -1
View File
@@ -29,13 +29,16 @@ const JudgeSettings = Schema.object({
detail: Schema.boolean().description('Show diff detail').default(true),
});
const oldPath = path.resolve(os.homedir(), '.config', 'hydro', 'judge.yaml');
const newPath = path.resolve(os.homedir(), '.hydro', 'judge.yaml');
const config = global.Hydro
? JudgeSettings({})
: (() => {
const cfg = JudgeSettings({});
const configFilePath = (process.env.CONFIG_FILE || argv.options.config)
? path.resolve(process.env.CONFIG_FILE || argv.options.config)
: path.resolve(os.homedir(), '.config', 'hydro', 'judge.yaml');
: fs.existsSync(oldPath) ? oldPath : newPath;
if (process.env.TEMP_DIR || argv.options.tmp) {
cfg.tmp_dir = path.resolve(process.env.TEMP_DIR || argv.options.tmp);