Skip to content

Commit 42b3947

Browse files
authored
Merge branch 'main' into check-conda.sh-loc
2 parents 81d41f8 + 4b7c3ac commit 42b3947

1 file changed

Lines changed: 0 additions & 14 deletions

File tree

src/managers/conda/condaUtils.ts

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1157,20 +1157,6 @@ async function getCondaHookPs1Path(condaPath: string): Promise<string> {
11571157
// Create the promise for finding the hook path
11581158
const hookPathPromise = (async () => {
11591159
const condaRoot = path.dirname(path.dirname(condaPath));
1160-
1161-
const hookLocations = [
1162-
path.join(condaRoot, 'shell', 'condabin', 'conda-hook.ps1'),
1163-
path.join(condaRoot, 'Library', 'shell', 'condabin', 'conda-hook.ps1'),
1164-
path.join(condaRoot, 'condabin', 'conda-hook.ps1'),
1165-
path.join(condaRoot, 'etc', 'profile.d', 'conda-hook.ps1'),
1166-
];
1167-
1168-
const found = await findFileInLocations(hookLocations, 'conda-hook.ps1', condaPath);
1169-
if (found) {
1170-
return found;
1171-
}
1172-
1173-
// Fall back to the traditional location as a last resort
11741160
return path.join(condaRoot, 'shell', 'condabin', 'conda-hook.ps1');
11751161
})();
11761162

0 commit comments

Comments
 (0)