fix: bugs seen with a test run

Author: karthiknadig

src/features/terminal/startup/bashStartup.ts

@@ -23,15 +23,15 @@ async function isZshInstalled(): Promise<boolean> {
 async function isGitBashInstalled(): Promise<boolean> {
     const gitPath = await which('git', { nothrow: true });
     if (gitPath) {
-        const gitBashPath = path.join(path.dirname(gitPath), 'bin', 'bash.exe');
+        const gitBashPath = path.join(path.dirname(path.dirname(gitPath)), 'bin', 'bash.exe');
         return await fs.pathExists(gitBashPath);
     }
     return false;
 }
 
 async function getBashProfiles(): Promise<string[]> {
     const homeDir = os.homedir();
-    const profiles: string[] = [path.join(homeDir, '.bashrc'), path.join(homeDir, '.bash_profile')];
+    const profiles: string[] = [path.join(homeDir, '.bashrc')];
 
     // Filter to only existing profiles or the first one if none exist
     const existingProfiles = await Promise.all(

src/features/terminal/startup/cmdStartup.ts

@@ -61,7 +61,7 @@ const regionEnd = 'rem <<< vscode python';
 
 function getActivationContent(key: string): string {
     const lineSep = isWindows() ? '\r\n' : '\n';
-    return ['', '', regionStart, `if defined ${key} (`, `    call "%${key}%"`, ')', regionEnd, ''].join(lineSep);
+    return ['', '', regionStart, `if defined ${key} (`, `    call %${key}%`, ')', regionEnd, ''].join(lineSep);
 }
 
 function getMainBatchFileContent(startupFile: string, existingContent?: string): string {

src/features/terminal/startup/powershellStartup.ts

@@ -27,12 +27,17 @@ async function getPowerShellProfiles(): Promise<PowerShellInfo[]> {
 }
 
 async function getProfileForShell(shell: 'powershell' | 'pwsh'): Promise<PowerShellInfo | undefined> {
-    const profilePath = await runCommand(`${shell} -Command $profile`);
-    if (!profilePath) {
-        traceVerbose(`${shell} is not available or failed to get profile path`);
+    try {
+        const profilePath = await runCommand(`${shell} -Command $profile`);
+        if (!profilePath) {
+            traceVerbose(`${shell} is not available or failed to get profile path`);
+            return undefined;
+        }
+        return { shell, profilePath };
+    } catch (err) {
+        traceVerbose(`${shell} is not available or failed to get profile path`, err);
         return undefined;
     }
-    return { shell, profilePath };
 }
 
 const regionStart = '#region vscode python';