From 4645729e64cdb08e1fa3079becd3716a2cb122d3 Mon Sep 17 00:00:00 2001 From: jtl959 Date: Wed, 19 Aug 2026 18:35:48 +0800 Subject: [PATCH] improve env_loc.js to able to convert relative paths entered by users to absolute paths --- .prettierrc.js | 0 env_loc.js | 14 ++++++-------- gitignore_merge.sh | 0 3 files changed, 6 insertions(+), 8 deletions(-) mode change 100755 => 100644 .prettierrc.js mode change 100755 => 100644 gitignore_merge.sh diff --git a/.prettierrc.js b/.prettierrc.js old mode 100755 new mode 100644 diff --git a/env_loc.js b/env_loc.js index 5daf9dc..321f9ae 100644 --- a/env_loc.js +++ b/env_loc.js @@ -37,8 +37,6 @@ const existingEnv = fs.existsSync('./env_loc.gitomit.sfomit.json') ? require(pat const baseEnv = Object.assign({}, paramDefaults, defaultEnv, existingEnv) -const isEmptyValue = (value) => value === '' || value === undefined || value === null - const askKeyValues = (keys) => new Promise((resolve) => { if (!keys.length || !process.stdin.isTTY) { @@ -61,8 +59,8 @@ const askKeyValues = (keys) => } const key = keys[index] - rl.question(`Input value for "${key}" (Enter to keep empty): `, (answer) => { - values[key] = answer === '' ? '' : answer + rl.question(`[${index}] ${key}: "${baseEnv[key]||''}"\n >> `, (answer) => { + if (answer !== '') values[key] = path.resolve(answer) index += 1 askNext() }) @@ -72,14 +70,14 @@ const askKeyValues = (keys) => }) const main = async () => { - const keysToPrompt = Object.keys(baseEnv).filter((key) => isEmptyValue(baseEnv[key])) - const inputValues = await askKeyValues(keysToPrompt) + console.log('\n::*** Configuring local environment. \nEnter new values or keep blank for no change:\n') + const inputValues = await askKeyValues(Object.keys(baseEnv)) const localEnv = Object.assign({}, baseEnv, inputValues) fs.writeFileSync(path.resolve('./env_loc.gitomit.sfomit.json'), JSON.stringify(localEnv, null, 2), 'utf8') - console.log('\n::*** Configuring local enviroment:') - console.log(localEnv) + console.log('\n::*** Configured local enviroment:') + console.log(localEnv, '\n') } if (require.main === module) { diff --git a/gitignore_merge.sh b/gitignore_merge.sh old mode 100755 new mode 100644