updates

Author: Pat-Lafon

.bashrc

@@ -18,17 +18,16 @@ alias duck='{ du -ha | sort -rh | head -20;} 2> /dev/null'
 alias common="history | awk '{CMD[\$2]++;count++;}END { for (a in CMD)print CMD[a] \" \" CMD[a]/count*100 \"% \" a;}' |\
  grep -v \"./\" | column -c3 -s \" \" -t | sort -nr | nl | head"
 
-# This makes some assumptions about the ordering of arguments that may not be true
 function brew() {
     if [[ $1 == "rm" || $1 == "uninstall" ]]; then
-        local pkg="$2"  # Save package name before shift
+        local pkg="$2"
         shift
         command brew rm "$@"
 
         # Only check deps if we actually removed something successfully
         if [[ $? -eq 0 && -n "$pkg" ]]; then
             local -a deps
-            mapfile -t deps < <(join <(brew leaves) <(brew deps "$pkg") 2>/dev/null)
+            mapfile -t deps < <(join <(command brew leaves) <(command brew deps "$pkg") 2>/dev/null)
             if (( ${#deps[@]} > 0 )); then
                 echo "Removing unused dependencies: ${deps[*]}"
                 command brew rm "${deps[@]}"
@@ -41,10 +40,16 @@ function brew() {
 
 function git() {
     if [[ "$1" == "push" && "$*" == *"--force"* ]]; then
-        # Replace --force with --force-with-lease in the command line
-        local cmd_line="$*"
-        cmd_line="${cmd_line// --force/ --force-with-lease}"
-        eval "command git $cmd_line"
+        local -a args=()
+        local arg
+        for arg in "$@"; do
+            if [[ "$arg" == "--force" ]]; then
+                args+=("--force-with-lease")
+            else
+                args+=("$arg")
+            fi
+        done
+        command git "${args[@]}"
     else
         command git "$@"
     fi
@@ -59,11 +64,7 @@ function ls() {
         fi
     done
     if (( long )); then
-        if [[ "$(uname)" == "Darwin" ]]; then
-            command ls -GhLa "$@"
-        else
-            command ls -GhLa --color=auto "$@"
-        fi
+        command ls -GhLa "$@"
     else
         command ls "$@"
     fi
@@ -84,11 +85,16 @@ function rm() {
         for target in "$@"; do
             [[ $target == -* ]] && continue
             [[ ! -e $target ]] && continue
-            abs_target=$(cd -- "$(dirname -- "$target")" 2>/dev/null && printf '%s/%s' "$(pwd)" "$(basename -- "$target")") || continue
+            if [[ $target == /* ]]; then
+                abs_target=$target
+            else
+                abs_target=$PWD/$target
+            fi
             if [[ -d $abs_target ]]; then
                 check_dir=$abs_target
             else
-                check_dir=$(dirname -- "$abs_target")
+                check_dir=${abs_target%/*}
+                [[ -z $check_dir ]] && check_dir=/
             fi
             repo_root=$(command git -C "$check_dir" rev-parse --show-toplevel 2>/dev/null) || continue
             if [[ -n "$(command git -C "$repo_root" status --porcelain -- "$abs_target" 2>/dev/null)" ]]; then
@@ -114,12 +120,14 @@ function rm() {
     return $rc
 }
 
-function cat() {
-    command bat --style=plain --paging=never "$@" 2>/dev/null || command cat "$@"
-}
+if command -v bat >/dev/null; then
+    function cat() {
+        command bat --style=plain --paging=never "$@"
+    }
+fi
 
 function extract() {
-    if [ -f "$1" ]; then
+    if [[ -f "$1" ]]; then
         case $1 in
             *.tar.bz2)   tar xjf "$1"     ;;
             *.tar.gz)    tar xzf "$1"     ;;
@@ -135,7 +143,7 @@ function extract() {
             *)     echo "'$1' cannot be extracted via extract()" ;;
         esac
     else
-	    echo "$1" is not a valid file
+        echo "'$1' is not a valid file"
     fi
 }
 
@@ -145,27 +153,34 @@ function gh() {
         local exit_code=$?
 
         if [[ $exit_code -eq 0 ]]; then
-            # First non-flag arg after "clone" is the repo identifier
-            local repo_arg=""
+            # First non-flag arg after "clone" is the repo identifier; the second
+            # (if present, before "--") is an explicit target directory.
+            local repo_arg="" target_arg="" arg
             for arg in "${@:3}"; do
-                if [[ "$arg" != -* ]]; then
+                [[ "$arg" == "--" ]] && break
+                [[ "$arg" == -* ]] && continue
+                if [[ -z "$repo_arg" ]]; then
                     repo_arg="$arg"
+                else
+                    target_arg="$arg"
                     break
                 fi
             done
 
             if [[ -n "$repo_arg" ]]; then
-                local repo_name
-                repo_name=$(basename "$repo_arg" .git)
-                if [[ -d "$repo_name" ]] && cd "$repo_name"; then
+                local clone_dir
+                if [[ -n "$target_arg" ]]; then
+                    clone_dir="$target_arg"
+                else
+                    clone_dir=$(basename "$repo_arg" .git)
+                fi
+                if [[ -d "$clone_dir" ]] && cd "$clone_dir"; then
                     # Derive owner/repo from origin so set-default works regardless
                     # of which form the user passed to clone (owner/repo, https://, git@…)
                     local origin_url
                     origin_url=$(git remote get-url origin 2>/dev/null)
-                    if [[ "$origin_url" == *github.com* ]]; then
-                        local repo_path
-                        repo_path=$(echo "$origin_url" | sed -E 's|.*github\.com[:/]([^/]+/[^/]+)(\.git)?.*|\1|')
-                        [[ -n "$repo_path" ]] && command gh repo set-default "$repo_path" 2>/dev/null || true
+                    if [[ "$origin_url" =~ github\.com[:/]([^/]+/[^/]+?)(\.git)?$ ]]; then
+                        command gh repo set-default "${BASH_REMATCH[1]}" 2>/dev/null
                     fi
                 fi
             fi
@@ -180,5 +195,5 @@ function gh() {
 # -------------- Per-shell tool initialization --------------
 # These hook into PROMPT_COMMAND / keybindings / PS1, which are shell-local —
 # they must run in every interactive shell, not just login shells. Hence .bashrc.
-[ -x "$(command -v starship)" ] && eval "$(starship init bash)"
-[ -x "$(command -v atuin)" ] && eval "$(atuin init bash)"
+command -v starship >/dev/null && eval "$(starship init bash)"
+command -v atuin >/dev/null && eval "$(atuin init bash)"