gitbash 1.6.0 → 1.6.2

package/bin/gitbash

@@ -325,8 +325,11 @@ while [[ -L "$SOURCE" ]]; do
 done
 SCRIPT_DIR="$(cd -P "$(dirname "$SOURCE")/.." && pwd)"
 
+# Export so sourced command files can use it
+export SCRIPT_DIR
+
 COMMANDS_DIR="$SCRIPT_DIR/commands"
-VERSION="$(grep -o '"version": *"[^"]*"' "$SCRIPT_DIR/package.json" | cut -d'"' -f4)"
+VERSION="$(grep -o '"version": *"[^"]*"' "$SCRIPT_DIR/package.json" | head -1 | cut -d'"' -f4)"
 
 # Available commands
 COMMANDS=(

package/commands/branch.sh

@@ -152,19 +152,13 @@ EOF
     # -----------------------------
     case "$selection" in
         "$create_option")
-            # Find gitbash root directory
-            GITBASH_ROOT="$(cd "$SOURCE_DIR/.." && pwd)"
-            "$GITBASH_ROOT/bin/gitbash" create
+            gitbash create
             ;;
         "$switch_option")
-            # Find gitbash root directory
-            GITBASH_ROOT="$(cd "$SOURCE_DIR/.." && pwd)"
-            "$GITBASH_ROOT/bin/gitbash" switch
+            gitbash switch
             ;;
         "$update_option")
-            # Find gitbash root directory
-            GITBASH_ROOT="$(cd "$SOURCE_DIR/.." && pwd)"
-            "$GITBASH_ROOT/bin/gitbash" update
+            gitbash update
             ;;
         "$abort_label")
             echo "Aborted."

package/commands/cleanup.sh

@@ -164,21 +164,14 @@ EOF
     recent_branches=()
 
     # Variables for loop (declared once to avoid zsh output on redeclaration)
-    local last_commit_ts relative_date author_email author_name
     local has_remote configured_upstream entry
 
     # Process each local branch
-    while IFS= read -r branch; do
+    while IFS='|' read -r branch last_commit_ts relative_date author_email author_name; do
         # Skip base branch
         [[ "$branch" == "$base_branch" ]] && continue
         [[ -z "$branch" ]] && continue
 
-        # Get last commit info for all branches
-        last_commit_ts=$(git log -1 --format='%ct' "$branch" 2>/dev/null)
-        relative_date=$(git log -1 --format='%cr' "$branch" 2>/dev/null)
-        author_email=$(git log -1 --format='%ae' "$branch" 2>/dev/null)
-        author_name=$(git log -1 --format='%an' "$branch" 2>/dev/null)
-        
         # Check if remote branch exists
         has_remote=false
         if echo "$remote_branches" | grep -qx "$branch"; then
@@ -201,7 +194,7 @@ EOF
             # Recent: has recent activity (don't pre-select)
             recent_branches+=("$entry")
         fi
-    done < <(git for-each-ref --format='%(refname:short)' refs/heads)
+    done < <(git for-each-ref --format='%(refname:short)|%(committerdate:unix)|%(committerdate:relative)|%(committeremail)|%(committername)' refs/heads)
 
     # Sort each category by timestamp (most recent first), compatible with bash 3.x (no mapfile)
     _sort_desc() {

package/commands/pr.sh

@@ -93,12 +93,8 @@ EOF
         echo "Continuing without committing..."
         ;;
       *)
-        # Find gitbash root directory (two levels up from commands/)
-        SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
-        GITBASH_ROOT="$(cd "$SOURCE_DIR/.." && pwd)"
-        
         # Run status command for interactive staging and committing
-        "$GITBASH_ROOT/bin/gitbash" status
+        gitbash status
         if [[ $? -ne 0 ]]; then
           echo "Commit cancelled or failed. Aborting PR creation."
           return 1

package/commands/stashes.sh

@@ -151,19 +151,13 @@ EOF
     # -----------------------------
     case "$selection" in
         "$stash_option")
-            # Find gitbash root directory
-            GITBASH_ROOT="$(cd "$SOURCE_DIR/.." && pwd)"
-            "$GITBASH_ROOT/bin/gitbash" stash
+            gitbash stash
             ;;
         "$unstash_option")
-            # Find gitbash root directory
-            GITBASH_ROOT="$(cd "$SOURCE_DIR/.." && pwd)"
-            "$GITBASH_ROOT/bin/gitbash" unstash
+            gitbash unstash
             ;;
         "$cleanup_option")
-            # Find gitbash root directory
-            GITBASH_ROOT="$(cd "$SOURCE_DIR/.." && pwd)"
-            "$GITBASH_ROOT/bin/gitbash" cleanstash
+            gitbash cleanstash
             ;;
         "$abort_label")
             echo "Aborted."

package/commands/status.sh

@@ -306,10 +306,8 @@ EOF
       echo "Ready to commit and push staged changes."
       echo "Press Ctrl+C to abort."
       echo
-      # Find gitbash root directory (two levels up from commands/)
-      GITBASH_ROOT="$(cd "$SOURCE_DIR/.." && pwd)"
       # Directly prompt for commit message (user can Ctrl+C to abort)
-      "$GITBASH_ROOT/bin/gitbash" commit -s -p
+      gitbash commit -s -p
       break
     fi
   done

package/package.json

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