Skip to content

fix: remove accidental indentation from shell config template strings #435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dbast merged 3 commits into from
Jan 8, 2026
+73 −59
Merged

fix: remove accidental indentation from shell config template strings #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0095fdc
fix: remove accidental indentation from shell config template strings
jezdez Dec 15, 2025
b37e4a0
Merge branch 'main' into fix/template-string-indentation
dbast Dec 15, 2025
d3b9824
Commit result of `npm run format`
dbast Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 27 additions & 30 deletions dist/setup/index.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

75 changes: 46 additions & 29 deletions src/conda.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,47 +419,64 @@ export async function condaInit(
}

// PowerShell profiles
let powerExtraText = `
# ----------------------------------------------------------------------------`;
// NOTE: Using array.join() to prevent auto-formatters from adding indentation
const powerLines: string[] = [
"",
"# ----------------------------------------------------------------------------",
];
if (isValidActivate) {
powerExtraText += `
# Conda Setup Action: Custom activation
conda activate "${inputs.activateEnvironment}"`;
powerLines.push(
"# Conda Setup Action: Custom activation",
`conda activate "${inputs.activateEnvironment}"`,
);
}
powerExtraText += `
# ----------------------------------------------------------------------------`;
powerLines.push(
"# ----------------------------------------------------------------------------",
);
const powerExtraText = powerLines.join("\n");

// Bash profiles
let bashExtraText: string = `
# ----------------------------------------------------------------------------
# Conda Setup Action: Basic configuration
set -eo pipefail`;
// NOTE: Using array.join() to prevent auto-formatters from adding indentation
const bashLines: string[] = [
"",
"# ----------------------------------------------------------------------------",
"# Conda Setup Action: Basic configuration",
"set -eo pipefail",
];
if (isValidActivate) {
bashExtraText += `
# Conda Setup Action: Custom activation
conda activate "${inputs.activateEnvironment}"`;
bashExtraText += `
# ----------------------------------------------------------------------------`;
bashLines.push(
"# Conda Setup Action: Custom activation",
`conda activate "${inputs.activateEnvironment}"`,
"# ----------------------------------------------------------------------------",
);
}
const bashExtraText = bashLines.join("\n");

// Batch profiles
let batchExtraText = `
:: ---------------------------------------------------------------------------`;
// NOTE: Using array.join() to prevent auto-formatters from adding indentation
const batchLines: string[] = [
"",
":: ---------------------------------------------------------------------------",
];
if (autoActivateDefault) {
batchExtraText += `
:: Conda Setup Action: Activate default environment
@CALL "%CONDA_BAT%" activate`;
batchLines.push(
":: Conda Setup Action: Activate default environment",
'@CALL "%CONDA_BAT%" activate',
);
}
if (isValidActivate) {
batchExtraText += `
:: Conda Setup Action: Custom activation
@CALL "%CONDA_BAT%" activate "${inputs.activateEnvironment}"`;
batchLines.push(
":: Conda Setup Action: Custom activation",
`@CALL "%CONDA_BAT%" activate "${inputs.activateEnvironment}"`,
);
}
batchExtraText += `
:: Conda Setup Action: Basic configuration
@SETLOCAL EnableExtensions
@SETLOCAL DisableDelayedExpansion
:: ---------------------------------------------------------------------------`;
batchLines.push(
":: Conda Setup Action: Basic configuration",
"@SETLOCAL EnableExtensions",
"@SETLOCAL DisableDelayedExpansion",
":: ---------------------------------------------------------------------------",
);
const batchExtraText = batchLines.join("\n");

const shells: types.IShells = {
"~/.bash_profile": bashExtraText,
Expand Down
Loading