This commit is contained in:
2026-10-10 22:18:04 -04:00
parent cca893b58d
commit 1654e0f867
6 changed files with 110 additions and 50 deletions
+23 -10
View File
@@ -28,6 +28,11 @@ export const jjEnsure = async ({ returnProcessEnvs = false }) => {
fs.mkdirSync(jjConfigs.JJ_TMP_DIR, { recursive: true });
}
if (!fs.existsSync(`${jjConfigs.JJ_TMP_DIR}/~~secrets`)) {
jjLog(`tmp folder ${`${jjConfigs.JJ_TMP_DIR}/~~secrets`} is not exist creating`);
fs.mkdirSync(`${jjConfigs.JJ_TMP_DIR}/~~secrets`, { recursive: true });
}
if (!fs.existsSync(jjConfigs.workspacesFilePath)) {
await fs.writeFile(jjConfigs.workspacesFilePath, JSON.stringify([], null, 4), "utf8");
}
@@ -56,16 +61,22 @@ export const jjEnsure = async ({ returnProcessEnvs = false }) => {
}
if (!jjConfigs.jjYamlPath) {
console.log(chalk.magenta.bold(`please add it here in absolute path`));
const answer: any = await inquirer.prompt([
{
type: "input",
name: "jjYamlPath",
message: "",
},
]);
jjConfigs.jjYamlPath = answer.jjYamlPath;
if (process.env['JJ_WORKSPACE_DIR_TMP']) {
jjConfigs.jjYamlPath = `${process.env['JJ_WORKSPACE_DIR_TMP']}/jj.yaml`;
} else {
console.log(chalk.magenta.bold(`please add it here in absolute path`));
const answer: any = await inquirer.prompt([
{
type: "input",
name: "jjYamlPath",
message: "",
},
]);
jjConfigs.jjYamlPath = answer.jjYamlPath;
}
}
if (!fs.existsSync(jjConfigs.jjYamlPath)) {
jjLogError(`can not find ${jjConfigs.jjYamlPath}`);
@@ -104,6 +115,8 @@ export const jjEnsure = async ({ returnProcessEnvs = false }) => {
jjConfigs.processEnvs.JJ_DATA_DIR = jjConfigs.JJ_DATA_DIR;
jjConfigs.JJ_WORKSPACE_TMP_DIR = `${jjConfigs.JJ_WORKSPACE_DIR}/~~tmp`;
jjConfigs.processEnvs.JJ_WORKSPACE_TMP_DIR = jjConfigs.JJ_WORKSPACE_TMP_DIR;
jjConfigs.JJ_SECRET_TMP_DIR = `${jjConfigs.JJ_TMP_DIR}/~~secrets`;
jjConfigs.processEnvs.JJ_SECRET_TMP_DIR = jjConfigs.JJ_SECRET_TMP_DIR;
jjConfigs.processEnvs.JJ_WORKSPACE_PROJECT_NAME = jjConfigs.jjYamlObj.name;
jjConfigs.processEnvs.ASDF_DIR = `${process.env.JJ_DATA_DIR}/~~asdf_${jjConfigs.processEnvs.JJ_WORKSPACE_PROJECT_NAME}`;
jjConfigs.processEnvs.ASDF_DATA_DIR = `${process.env.JJ_DATA_DIR}/~~asdf_${jjConfigs.processEnvs.JJ_WORKSPACE_PROJECT_NAME}`;
@@ -113,7 +126,7 @@ export const jjEnsure = async ({ returnProcessEnvs = false }) => {
.map((key) => `${key} ${jjConfigs.jjYamlObj.asdf.tools[key].version}`)
.join("\n");
saveFileIfItChanged(asdfToolsVersionFileContent, jjConfigs.processEnvs.ASDF_DEFAULT_TOOL_VERSIONS_FILENAME);
saveFileIfItChanged(`${asdfToolsVersionFileContent}\n`, jjConfigs.processEnvs.ASDF_DEFAULT_TOOL_VERSIONS_FILENAME);
// export ASDF_DEFAULT_TOOL_VERSIONS_FILENAME="$GC_HOME_DIR/.tool-versions"
jjConfigs.processEnvs.ASDF_VERSION = jjConfigs.jjYamlObj.asdf.version;