gitbash 2.2.0 → 2.2.2

package/README.md

@@ -46,32 +46,20 @@ echo 'eval "$(gitbash --init)"' >> ~/.zshrc
 
 ### Windows
 
-In Git Bash (part of [Git for Windows](https://gitforwindows.org)); in WSL, follow the Linux steps:
+Needs [Git for Windows](https://gitforwindows.org). In PowerShell or Git Bash; in WSL, follow the Linux steps:
 
-```bash
+```powershell
 npm i -g gitbash
 winget install junegunn.fzf dandavison.delta sharkdp.bat   # needs fzf >= 0.54
 gitbash --config
 ```
 
-Shell integration for Git Bash:
-
-```bash
-echo 'eval "$(gitbash --init)"' >> ~/.bashrc
-```
-
-Shell integration for PowerShell: create the functions in Git Bash, then load them in your profile in PowerShell:
-
-```bash
-gitbash --init --shell=pwsh > ~/gitbash.ps1   # switch is a PowerShell keyword: use gitbash switch
-```
+`gitbash --config` also sets up the shell integration: it offers to load the gitbash functions in your PowerShell profile (and to allow local scripts, which Windows PowerShell blocks by default) and in `~/.bashrc` for Git Bash. Open a new window afterwards. `switch` is a PowerShell keyword: use `gitbash switch` there.
 
-This creates your PowerShell profile if needed, loads `gitbash.ps1` from it in every new window, and allows local scripts to run (Windows PowerShell 5.1 blocks them by default):
+To set it up by hand, add this line to your PowerShell profile (`notepad $PROFILE`):
 
 ```powershell
-if (!(Test-Path $PROFILE)) { New-Item -Force $PROFILE }
-Add-Content $PROFILE '. ~/gitbash.ps1'
-Set-ExecutionPolicy -Scope CurrentUser RemoteSigned   # Windows PowerShell 5.1 only
+gitbash --init --shell=pwsh | Out-String | Invoke-Expression
 ```
 
 ### Without npm
@@ -84,7 +72,7 @@ curl -fsSL https://raw.githubusercontent.com/jaggli/gitbash/main/install.sh | sh
 ```
 
 ```powershell
-# Windows PowerShell (needs Git for Windows)
+# Windows PowerShell (needs Git for Windows; prints the line for your $PROFILE)
 irm https://raw.githubusercontent.com/jaggli/gitbash/main/install.ps1 | iex
 ```
 

package/bin/gitbash

@@ -3,6 +3,8 @@
 
 # Resolve symlinks to get the actual script location
 SOURCE="${BASH_SOURCE[0]}"
+# Started from Windows with C:\...\bin\gitbash: dirname needs forward slashes
+[[ "$OSTYPE" == msys* || "$OSTYPE" == cygwin* ]] && SOURCE="${SOURCE//\\//}"
 while [[ -L "$SOURCE" ]]; do
     DIR="$(cd -P "$(dirname "$SOURCE")" && pwd)"
     SOURCE="$(readlink "$SOURCE")"
@@ -359,8 +361,60 @@ check_dependencies() {
 }
 
 # Offer to add the shell integration to the rc file of the user's shell
+# Line that loads the PowerShell functions, in $PROFILE
+PWSH_INIT_LINE='gitbash --init --shell=pwsh | Out-String | Invoke-Expression'
+
+# Offer to load the functions in the profiles of Windows PowerShell (powershell.exe)
+# and PowerShell 7 (pwsh.exe), and to allow local scripts if needed.
+# PowerShell edits its own profile: it may be UTF-16, which bash can't append to.
+check_pwsh_integration() {
+    local exe info profile has policy found=false
+    # Prints "<profile>|<True if it loads gitbash>|<execution policy>" (no double
+    # quotes in PowerShell commands: they don't survive the Windows command line)
+    local query="\$p = \$PROFILE; \$has = (Test-Path -LiteralPath \$p) -and [bool](Select-String -Quiet -SimpleMatch -Pattern 'gitbash --init' -LiteralPath \$p); Write-Output (\$p + '|' + \$has + '|' + (Get-ExecutionPolicy))"
+    for exe in powershell.exe pwsh.exe; do
+        command -v "$exe" >/dev/null 2>&1 || continue
+        info=$("$exe" -NoProfile -NonInteractive -Command "$query" 2>/dev/null | tr -d '\r' | tail -n 1)
+        IFS='|' read -r profile has policy <<< "$info"
+        [[ -n "$profile" ]] || continue
+        found=true
+
+        echo
+        if [[ "$has" == "True" ]]; then
+            print_info "PowerShell integration already configured in $profile"
+        elif gb_confirm "Load the gitbash functions in PowerShell ($profile)?" y; then
+            if "$exe" -NoProfile -NonInteractive -Command \
+                "\$p = \$PROFILE; if (!(Test-Path -LiteralPath \$p)) { New-Item -Force -Path \$p | Out-Null }; Add-Content -LiteralPath \$p '$PWSH_INIT_LINE'"; then
+                print_success "Added to $profile. Open a new PowerShell window to use it."
+            else
+                print_error "Could not change $profile. Add this line yourself: $PWSH_INIT_LINE"
+            fi
+        fi
+
+        # Restricted (the default of Windows PowerShell) and AllSigned block the profile
+        case "$policy" in
+            Restricted|AllSigned|Undefined)
+                if gb_confirm "PowerShell blocks scripts, including your profile ($policy). Allow local scripts (execution policy RemoteSigned)?" y; then
+                    if "$exe" -NoProfile -NonInteractive -Command 'Set-ExecutionPolicy -Scope CurrentUser RemoteSigned -Force'; then
+                        print_success "Local scripts allowed."
+                    else
+                        print_error "Could not change the execution policy (it may be set by your organization)."
+                    fi
+                fi
+                ;;
+        esac
+    done
+    if [[ "$found" == false ]]; then
+        echo
+        print_info "For PowerShell, add this line to your \$PROFILE:"
+        echo "  $PWSH_INIT_LINE"
+    fi
+}
+
 check_shell_integration() {
     local shell_name shell_rc
+    # Can't tell PowerShell from Git Bash here: offer both
+    gb_is_windows && check_pwsh_integration
     shell_name=$(basename "${SHELL:-}")
     case "$shell_name" in
         zsh) shell_rc="$HOME/.zshrc" ;;
@@ -372,8 +426,10 @@ check_shell_integration() {
             fi
             ;;
         *)
-            echo
-            print_info "Shell '$shell_name' is not supported for integration. Use 'gitbash <command>' or aliases."
+            if ! gb_is_windows; then
+                echo
+                print_info "Shell '$shell_name' is not supported for integration. Use 'gitbash <command>' or aliases."
+            fi
             return 0
             ;;
     esac
@@ -540,9 +596,8 @@ show_init_pwsh() {
     gb_is_windows && command -v cygpath >/dev/null 2>&1 && bin=$(cygpath -m "$bin")
     bash_q=$(pwsh_quote "$(pwsh_bash)")
     bin_q=$(pwsh_quote "$bin")
-    echo "# gitbash shell integration for PowerShell - save it and dot-source it in your \$PROFILE:"
-    echo "#   gitbash --init --shell=pwsh${prefix:+ --prefix=$prefix} > ~/gitbash.ps1"
-    echo "#   . ~/gitbash.ps1"
+    echo "# gitbash shell integration for PowerShell - add to your \$PROFILE:"
+    echo "#   gitbash --init --shell=pwsh${prefix:+ --prefix=$prefix} | Out-String | Invoke-Expression"
     echo "function gitbash { & $bash_q $bin_q @args }"
     for cmd in "${COMMANDS[@]}"; do
         # 'switch' is a PowerShell keyword: a function by that name can't be called

package/bin/gitbash.js

@@ -0,0 +1,97 @@
+#!/usr/bin/env node
+// npm entry point: runs bin/gitbash with bash.
+// On Windows, npm's own launchers would run the first bash on PATH, which is
+// often WSL's (C:\Windows\System32\bash.exe): use Git for Windows' bash instead.
+'use strict';
+
+var childProcess = require('child_process');
+var fs = require('fs');
+var path = require('path');
+
+// Forward slashes: bash's dirname doesn't split C:\...\bin\gitbash
+var script = path.join(__dirname, 'gitbash').replace(/\\/g, '/');
+
+function isFile(file) {
+    try {
+        return fs.statSync(file).isFile();
+    } catch (e) {
+        return false;
+    }
+}
+
+// <Git>\bin\bash.exe: it puts git and the Unix tools on PATH, unlike usr\bin\bash.exe
+function bashIn(root) {
+    var bash = root && path.join(root, 'bin', 'bash.exe');
+    return bash && isFile(bash) ? bash : null;
+}
+
+function gitForWindowsBash() {
+    var dirs = (process.env.PATH || '').split(path.delimiter);
+    var i, dir, bash;
+    // git.exe is in <Git>\cmd, <Git>\bin or <Git>\mingw64\bin
+    for (i = 0; i < dirs.length; i++) {
+        dir = dirs[i].replace(/^"|"$/g, '');
+        if (dir && isFile(path.join(dir, 'git.exe'))) {
+            bash = bashIn(path.dirname(dir)) || bashIn(path.dirname(path.dirname(dir)));
+            if (bash) return bash;
+        }
+    }
+    var keys = ['HKLM\\SOFTWARE\\GitForWindows', 'HKCU\\SOFTWARE\\GitForWindows'];
+    for (i = 0; i < keys.length; i++) {
+        var out = childProcess.spawnSync('reg', ['query', keys[i], '/v', 'InstallPath'], { encoding: 'utf8' });
+        var match = /InstallPath\s+REG_SZ\s+(.+)/.exec(out.stdout || '');
+        bash = match && bashIn(match[1].trim());
+        if (bash) return bash;
+    }
+    var roots = [
+        process.env.ProgramFiles && path.join(process.env.ProgramFiles, 'Git'),
+        process.env.LOCALAPPDATA && path.join(process.env.LOCALAPPDATA, 'Programs', 'Git')
+    ];
+    for (i = 0; i < roots.length; i++) {
+        bash = bashIn(roots[i]);
+        if (bash) return bash;
+    }
+    return null;
+}
+
+var bash = 'bash';
+if (process.platform === 'win32') {
+    bash = gitForWindowsBash();
+    if (!bash) {
+        process.stderr.write('gitbash needs Git for Windows. Install it with: winget install Git.Git\n');
+        process.exit(1);
+    }
+}
+
+var child = childProcess.spawn(bash, [script].concat(process.argv.slice(2)), { stdio: 'inherit' });
+
+// Ctrl-C (SIGINT, SIGQUIT) reaches bash and fzf directly from the terminal: wait
+// for them instead of exiting first. SIGTERM and SIGHUP are passed on.
+var handlers = {};
+['SIGINT', 'SIGQUIT', 'SIGTERM', 'SIGHUP'].forEach(function (signal) {
+    handlers[signal] = signal === 'SIGTERM' || signal === 'SIGHUP'
+        ? function () { child.kill(signal); }
+        : function () {};
+    try {
+        process.on(signal, handlers[signal]);
+    } catch (e) {
+        // Not supported on this platform
+    }
+});
+
+child.on('error', function (err) {
+    process.stderr.write('gitbash: could not run ' + bash + ': ' + err.message + '\n');
+    process.exit(1);
+});
+
+child.on('exit', function (code, signal) {
+    if (signal) {
+        // Exit the same way bash did
+        Object.keys(handlers).forEach(function (s) {
+            process.removeListener(s, handlers[s]);
+        });
+        process.kill(process.pid, signal);
+        return;
+    }
+    process.exit(code === null ? 1 : code);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitbash",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "description": "Opinionated git utilities for bash with fzf-powered menus",
   "author": "jaggli",
   "license": "MIT",
@@ -24,7 +24,7 @@
     "stash"
   ],
   "bin": {
-    "gitbash": "bin/gitbash"
+    "gitbash": "bin/gitbash.js"
   },
   "files": [
     "bin/",