gitbash 0.2.5 → 0.2.7

package/bin/gitbash

@@ -19,6 +19,7 @@ configure_gitbash() {
     local current_merge="${GITBASH_MERGE_COMMAND:-fork}"
 
     echo "Configure gitbash (writes to $CONFIG_FILE)"
+    echo
 
     local input prefix merge_cmd
 
@@ -36,7 +37,67 @@ GITBASH_FEATURE_BRANCH_PREFIX="$prefix"
 GITBASH_MERGE_COMMAND="$merge_cmd"
 EOF
 
+    echo
     echo "Saved configuration to $CONFIG_FILE"
+
+    # Check for shell integration
+    check_shell_integration
+}
+
+# Check if gitbash shell integration is set up
+check_shell_integration() {
+    local shell_rc=""
+    local shell_files=("$HOME/.zshrc" "$HOME/.bashrc" "$HOME/.bash_profile")
+    
+    # Find the first existing shell rc file
+    for file in "${shell_files[@]}"; do
+        if [[ -f "$file" ]]; then
+            shell_rc="$file"
+            break
+        fi
+    done
+
+    if [[ -z "$shell_rc" ]]; then
+        echo
+        echo "No shell config file found (.zshrc, .bashrc, .bash_profile)"
+        return 0
+    fi
+
+    # Check if gitbash integration already exists
+    local has_init=false
+    local has_alias=false
+
+    if grep -q 'eval.*gitbash --init' "$shell_rc" 2>/dev/null; then
+        has_init=true
+    fi
+
+    if grep -q 'alias.*gitbash' "$shell_rc" 2>/dev/null; then
+        has_alias=true
+    fi
+
+    # If neither init nor alias found, offer to add
+    if [[ "$has_init" == false && "$has_alias" == false ]]; then
+        echo
+        echo "Shell integration not found in $shell_rc"
+        local add_init
+        read -e -p "Add 'eval \"\$(gitbash --init)\"' to $shell_rc? (Y/n): " add_init
+        case "$add_init" in
+            [nN][oO]|[nN])
+                echo "Skipped shell integration."
+                ;;
+            *)
+                echo >> "$shell_rc"
+                echo '# gitbash shell integration' >> "$shell_rc"
+                echo 'eval "$(gitbash --init)"' >> "$shell_rc"
+                echo
+                echo "Added to $shell_rc"
+                echo "Run 'source $shell_rc' or restart your shell to activate."
+                ;;
+        esac
+    else
+        echo
+        echo "Shell integration already configured in $shell_rc"
+    fi
 }
 
 # Resolve symlinks to get the actual script location

package/commands/_utils.sh

@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2155
+# Common utilities for gitbash commands - compatible with bash and zsh
+
+# Portable read with prompt that works in both bash and zsh
+# Usage: prompt_read "prompt text" variable_name
+# The result is stored in the variable name provided
+prompt_read() {
+    local prompt="$1"
+    local varname="$2"
+    
+    if [[ -n "${ZSH_VERSION:-}" ]]; then
+        # zsh: use read with ?prompt syntax
+        read -r "${varname}?${prompt}"
+    else
+        # bash: use read -p
+        read -rp "$prompt" "$varname"
+    fi
+}
+
+# Portable read with readline editing (for defaults)
+# Usage: prompt_read_edit "prompt text" variable_name
+prompt_read_edit() {
+    local prompt="$1"
+    local varname="$2"
+    
+    if [[ -n "${ZSH_VERSION:-}" ]]; then
+        # zsh: use vared or read with ?prompt
+        read -r "${varname}?${prompt}"
+    else
+        # bash: use read -e -p
+        read -e -rp "$prompt" "$varname"
+    fi
+}

package/commands/branch.sh

@@ -1,3 +1,11 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2155
+
+# Source common utilities
+SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
+# shellcheck source=_utils.sh
+source "$SOURCE_DIR/_utils.sh"
+
 branch() {
     # -----------------------------
     # 0. Check for help/version flag
@@ -103,7 +111,7 @@ EOF
         echo "fzf is not installed."
 
         # Ask whether to install with Homebrew
-        read -rp "Install fzf with Homebrew? (y/N): " ans
+        prompt_read "Install fzf with Homebrew? (y/N): " ans
         case "$ans" in
             [yY][eE][sS]|[yY])
                 echo "Installing fzf with brew..."

package/commands/cleanstash.sh

@@ -1,3 +1,11 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2155
+
+# Source common utilities
+SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
+# shellcheck source=_utils.sh
+source "$SOURCE_DIR/_utils.sh"
+
 cleanstash() {
     # -----------------------------
     # 0. Check for help/version flag
@@ -69,7 +77,7 @@ EOF
         echo "fzf is not installed."
 
         # Ask whether to install with Homebrew
-        read -r -p "Install fzf with Homebrew? (y/N): " ans
+        prompt_read "Install fzf with Homebrew? (y/N): " ans
         case "$ans" in
             [yY][eE][sS]|[yY])
                 echo "Installing fzf with brew..."
@@ -164,7 +172,7 @@ EOF
     done
     echo
 
-    read -rp "Delete these ${#stash_ids[@]} stash(es)? (y/N): " confirm_ans
+    prompt_read "Delete these ${#stash_ids[@]} stash(es)? (y/N): " confirm_ans
     case "$confirm_ans" in
         [yY][eE][sS]|[yY])
             # -----------------------------
@@ -172,8 +180,10 @@ EOF
             # -----------------------------
             echo "Deleting stashes..."
             # Sort by stash number in descending order to delete safely
-            local sorted_ids
-            mapfile -t sorted_ids < <(printf '%s\n' "${stash_ids[@]}" | sort -t'{' -k2 -rn)
+            local sorted_ids=()
+            while IFS= read -r id; do
+                sorted_ids+=("$id")
+            done < <(printf '%s\n' "${stash_ids[@]}" | sort -t'{' -k2 -rn)
             
             for stash_id in "${sorted_ids[@]}"; do
                 echo "Dropping $stash_id ..."

package/commands/cleanup.sh

@@ -1,6 +1,11 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2155
 
+# Source common utilities
+SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
+# shellcheck source=_utils.sh
+source "$SOURCE_DIR/_utils.sh"
+
 # Cleanup local branches that are no longer needed
 cleanup() {
     # -----------------------------
@@ -85,7 +90,7 @@ EOF
     if [[ "$json_mode" == false ]]; then
         if ! command -v fzf >/dev/null 2>&1; then
             echo "fzf is not installed."
-            read -rp "Install fzf with Homebrew? (y/N): " ans
+            prompt_read "Install fzf with Homebrew? (y/N): " ans
             case "$ans" in
                 [yY][eE][sS]|[yY])
                     echo "Installing fzf with brew..."
@@ -106,9 +111,6 @@ EOF
     # -----------------------------
     # 2. Fetch and prune to sync with remote
     # -----------------------------
-    if [[ "$json_mode" == false ]]; then
-        echo "Fetching and pruning remote..."
-    fi
     if ! git fetch --prune origin 2>/dev/null; then
         if [[ "$json_mode" == false ]]; then
             echo "⚠ Fetch failed; continuing with local data." >&2
@@ -459,7 +461,7 @@ Found $total_count branches ($preselect_count pre-selected for deletion)" \
     # Default to Y if only merged branches, otherwise N
     local confirm
     if [[ "$only_merged" == true ]]; then
-        read -rp "Delete these ${#branches_to_delete[@]} local branch(es)? (Y/n): " confirm
+        prompt_read "Delete these ${#branches_to_delete[@]} local branch(es)? (Y/n): " confirm
         case "$confirm" in
             [nN][oO]|[nN])
                 echo "Deletion cancelled."
@@ -467,7 +469,7 @@ Found $total_count branches ($preselect_count pre-selected for deletion)" \
                 ;;
         esac
     else
-        read -rp "Delete these ${#branches_to_delete[@]} local branch(es)? (y/N): " confirm
+        prompt_read "Delete these ${#branches_to_delete[@]} local branch(es)? (y/N): " confirm
         case "$confirm" in
             [yY][eE][sS]|[yY])
                 ;;

package/commands/commit.sh

@@ -1,3 +1,11 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2155
+
+# Source common utilities
+SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
+# shellcheck source=_utils.sh
+source "$SOURCE_DIR/_utils.sh"
+
 # Stage all changes and commit with a message.
 # If no commit message argument is given, prompt the user for one.
 commit() {
@@ -84,7 +92,7 @@ EOF
   # If no commit message was provided...
   if [ -z "$msg" ]; then
     # Prompt the user for a commit message (no newline, no extra spaces)
-    read -rp "Commit message: " msg
+    prompt_read "Commit message: " msg
   fi
 
   # Check if there are staged changes
@@ -107,7 +115,7 @@ EOF
     echo
     echo "You have both staged and unstaged changes."
     echo
-    read -rp "Commit [s]taged only, or [a]ll changes? (s/a): " commit_choice
+    prompt_read "Commit [s]taged only, or [a]ll changes? (s/a): " commit_choice
     
     case "$commit_choice" in
       [sS])

package/commands/commits.sh

@@ -1,6 +1,11 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2155
 
+# Source common utilities
+SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
+# shellcheck source=_utils.sh
+source "$SOURCE_DIR/_utils.sh"
+
 # List recent commits and optionally revert selected ones
 commits() {
     # -----------------------------
@@ -57,7 +62,7 @@ EOF
 
     if ! command -v fzf >/dev/null 2>&1; then
         echo "fzf is not installed."
-        read -rp "Install fzf with Homebrew? (y/N): " ans
+        prompt_read "Install fzf with Homebrew? (y/N): " ans
         case "$ans" in
             [yY][eE][sS]|[yY])
                 echo "Installing fzf with brew..."
@@ -185,7 +190,7 @@ Showing last $count commits" \
     echo ""
 
     local confirm
-    read -rp "Revert these ${#commits_to_revert[@]} commit(s)? (y/N): " confirm
+    prompt_read "Revert these ${#commits_to_revert[@]} commit(s)? (y/N): " confirm
     case "$confirm" in
         [yY][eE][sS]|[yY])
             echo "Reverting commits..."

package/commands/create.sh

@@ -1,6 +1,11 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2155
 
+# Source common utilities
+SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
+# shellcheck source=_utils.sh
+source "$SOURCE_DIR/_utils.sh"
+
 create() {
     # -----------------------------
     # 0. Check for help/version flag
@@ -71,7 +76,7 @@ EOF
     else
         # Interactive mode
         echo "Enter Jira link (e.g., https://jira.company.com/browse/PROJ-123):"
-        read -rp " > " jira_link
+        prompt_read " > " jira_link
     fi
 
     if [[ -z "$jira_link" ]]; then
@@ -112,7 +117,7 @@ EOF
     # -----------------------------
     if [[ -z "$branch_title" ]]; then
         echo "Enter branch title (will be converted to lowercase with dashes):"
-        read -rp " > " branch_title
+        prompt_read " > " branch_title
     fi
 
     if [[ -z "$branch_title" ]]; then
@@ -138,7 +143,7 @@ EOF
     # -----------------------------
     if git show-ref --verify --quiet "refs/heads/$branch_name"; then
         echo "⚠ Branch '$branch_name' already exists locally."
-        read -rp "Switch to this branch instead? (Y/n): " ans
+        prompt_read "Switch to this branch instead? (Y/n): " ans
         case "$ans" in
             [nN][oO]|[nN])
                 echo "Aborted."

package/commands/stale.sh

@@ -1,3 +1,11 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2155
+
+# Source common utilities
+SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
+# shellcheck source=_utils.sh
+source "$SOURCE_DIR/_utils.sh"
+
 stale() {
     # -----------------------------
     # 0. Check for help/version flag and parse options
@@ -103,7 +111,7 @@ EOF
         if ! command -v fzf >/dev/null 2>&1; then
             echo "fzf is not installed."
 
-            read -rp "Install fzf with Homebrew? (y/N): " ans
+            prompt_read "Install fzf with Homebrew? (y/N): " ans
             case "$ans" in
                 [yY][eE][sS]|[yY])
                     echo "Installing fzf with brew..."
@@ -392,7 +400,7 @@ Showing $stale_count stale branches (older than 3 months)" \
     done
     echo ""
 
-    read -rp "Delete these ${#branches_to_delete[@]} branch(es) from remote? (y/N): " confirm
+    prompt_read "Delete these ${#branches_to_delete[@]} branch(es) from remote? (y/N): " confirm
     case "$confirm" in
         [yY][eE][sS]|[yY])
             echo "Deleting branches..."

package/commands/stashes.sh

@@ -1,3 +1,11 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2155
+
+# Source common utilities
+SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
+# shellcheck source=_utils.sh
+source "$SOURCE_DIR/_utils.sh"
+
 stashes() {
     # -----------------------------
     # 0. Check for help/version flag
@@ -102,7 +110,7 @@ EOF
         echo "fzf is not installed."
 
         # Ask whether to install with Homebrew
-        read -r -p "Install fzf with Homebrew? (y/N): " ans
+        prompt_read "Install fzf with Homebrew? (y/N): " ans
         case "$ans" in
             [yY][eE][sS]|[yY])
                 echo "Installing fzf with brew..."

package/commands/status.sh

@@ -1,3 +1,11 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2155
+
+# Source common utilities
+SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
+# shellcheck source=_utils.sh
+source "$SOURCE_DIR/_utils.sh"
+
 # Show git status with fzf file selector and diff preview
 status() {
   # -----------------------------
@@ -75,7 +83,7 @@ EOF
     echo "fzf is not installed."
 
     # Ask whether to install with Homebrew
-    read -rp "Install fzf with Homebrew? (y/N): " ans
+    prompt_read "Install fzf with Homebrew? (y/N): " ans
     case "$ans" in
       [yY][eE][sS]|[yY])
         echo "Installing fzf with brew..."
@@ -212,7 +220,7 @@ EOF
         for f in "${untracked_to_delete[@]}"; do
           echo "  - $f"
         done
-        read -rp "Delete these ${#untracked_to_delete[@]} untracked file(s)? (y/N): " confirm
+        prompt_read "Delete these ${#untracked_to_delete[@]} untracked file(s)? (y/N): " confirm
         case "$confirm" in
           [yY][eE][sS]|[yY])
             for f in "${untracked_to_delete[@]}"; do
@@ -232,7 +240,7 @@ EOF
         for f in "${files_to_revert[@]}"; do
           echo "  - $f"
         done
-        read -rp "Revert changes in these ${#files_to_revert[@]} file(s)? This cannot be undone. (y/N): " confirm
+        prompt_read "Revert changes in these ${#files_to_revert[@]} file(s)? This cannot be undone. (y/N): " confirm
         case "$confirm" in
           [yY][eE][sS]|[yY])
             for f in "${files_to_revert[@]}"; do
@@ -312,7 +320,7 @@ EOF
       done
       
       echo
-      read -rp "Would you like to commit and push these changes? (Y/n): " ans
+      prompt_read "Would you like to commit and push these changes? (Y/n): " ans
       case "$ans" in
         [nN][oO]|[nN])
           echo "Continuing..."

package/commands/switch.sh

@@ -1,3 +1,11 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2155
+
+# Source common utilities
+SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
+# shellcheck source=_utils.sh
+source "$SOURCE_DIR/_utils.sh"
+
 # Select and switch to a branch using fzf
 switch() {
   # -----------------------------
@@ -60,7 +68,7 @@ EOF
     echo "fzf is not installed."
 
     # Ask whether to install with Homebrew
-    read -rp "Install fzf with Homebrew? (y/N): " ans
+    prompt_read "Install fzf with Homebrew? (y/N): " ans
     case "$ans" in
       [yY][eE][sS]|[yY])
         echo "Installing fzf with brew..."

package/commands/unstash.sh

@@ -1,3 +1,11 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2155
+
+# Source common utilities
+SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
+# shellcheck source=_utils.sh
+source "$SOURCE_DIR/_utils.sh"
+
 unstash() {
     # -----------------------------
     # 0. Check for help/version flag
@@ -72,7 +80,7 @@ EOF
         echo "fzf is not installed."
 
         # Ask whether to install with Homebrew
-        read -rp "Install fzf with Homebrew? (y/N): " ans
+        prompt_read "Install fzf with Homebrew? (y/N): " ans
         case "$ans" in
             [yY][eE][sS]|[yY])
                 echo "Installing fzf with brew..."
@@ -165,7 +173,7 @@ EOF
     # 6. Confirm before dropping
     # -----------------------------
     echo
-    read -rp "Drop $stash_id now? (y/N): " drop_ans
+    prompt_read "Drop $stash_id now? (y/N): " drop_ans
     case "$drop_ans" in
         [yY][eE][sS]|[yY])
             echo "Dropping $stash_id ..."

package/commands/update.sh

@@ -1,3 +1,11 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2155
+
+# Source common utilities
+SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
+# shellcheck source=_utils.sh
+source "$SOURCE_DIR/_utils.sh"
+
 # Update the current branch with the latest version of master/main
 update() {
   local merge_tool="${GITBASH_FEATURE_BRANCH_PREFIX:-}"
@@ -122,7 +130,7 @@ EOF
     echo "You have uncommitted changes:"
     git status --short
     echo ""
-    read -rp "Commit changes before updating? (Y/n): " reply
+    prompt_read "Commit changes before updating? (Y/n): " reply
     if [[ "$reply" =~ ^[Nn]$ ]]; then
       echo "⚠ Cannot merge with uncommitted changes. Commit or stash them first."
       return 1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitbash",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "Opinionated git utilities for bash with fzf-powered menus",
   "author": "jaggli",
   "license": "MIT",