From: Oleg Broytman <phd@phdru.name>
Date: Sat, 10 Sep 2022 13:11:33 +0000 (+0300)
Subject: .bashrc: No need to test for `$BASH_VERSION`
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=1fbad022330aa4b8dce4e4be331205d5ac8b3181;p=dotfiles.git

.bashrc: No need to test for `$BASH_VERSION`
---

diff --git a/.bashrc b/.bashrc
index 319e303..69e4f15 100644
--- a/.bashrc
+++ b/.bashrc
@@ -215,91 +215,83 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
                 return 1
             fi
 
-            if test -n "$BASH_VERSION"; then
-                _list_remotes '^\(file:/\|/\|\.\./\)' # (file:/ or / or ../ at the beginning)
-                if [ ${#GIT_REMOTES[*]} -eq 1 ]; then
-                    remote=${GIT_REMOTES[0]}
-                    unset GIT_REMOTES
-                    cdgitpath remote.$remote.url
-                else
-                    unset GIT_REMOTES
-                    echo "Cannot find directory for any remote" >&2
-                    echo "Usage: cdremote [remote_name]" >&2
-                    return 1
-                fi
+            _list_remotes '^\(file:/\|/\|\.\./\)' # (file:/ or / or ../ at the beginning)
+            if [ ${#GIT_REMOTES[*]} -eq 1 ]; then
+                remote=${GIT_REMOTES[0]}
+                unset GIT_REMOTES
+                cdgitpath remote.$remote.url
             else
-                echo "Cannot find directory for remote $1" >&2
+                unset GIT_REMOTES
+                echo "Cannot find directory for any remote" >&2
                 echo "Usage: cdremote [remote_name]" >&2
                 return 1
             fi
         fi
     }
 
-    if test -n "$BASH_VERSION"; then
-        # completion for aliases in global .gitconfig
-
-        # fixup rbi rbia rbiap rbip - do refs name completion
-        _git_fixup() { __gitcomp_nl "$(__git_refs)" ; }
-        _git_rbi() { __gitcomp_nl "$(__git_refs)" ; }
-        _git_rbia() { __gitcomp_nl "$(__git_refs)" ; }
-        _git_rbiap() { __gitcomp_nl "$(__git_refs)" ; }
-        _git_rbip() { __gitcomp_nl "$(__git_refs)" ; }
-        #
-        # push-to-all-remotes - do branch name completion
-        _git_push_to_all_remotes() { __gitcomp_nl "$(__git_heads)" ; }
-
-        _cdgitpath_complete() {
-            local cur="${COMP_WORDS[COMP_CWORD]}"
-            COMPREPLY=(`compgen -W "$(__git_config_get_set_variables)" -- "$cur"`)
-        }
-
-        _git_open() {
-            _cdgitpath_complete
-        }
-
-        complete -F _cdgitpath_complete cdgitpath git-open
-
-        # list remotes with URLs matching a regexp
-        _list_remotes() {
-            if [ $# -ne 1 ]; then
-                echo "Usage: _list_remotes remote_regexp" >&2
-                return 1
-            fi
-            declare -ag GIT_REMOTES=()
-            local remote
-            for remote in `git remote`; do
-                if git config --get remote.$remote.url | grep -q "$1"; then
-                    GIT_REMOTES+=($remote)
-                fi
-            done
-        }
-
-        # completion for cdremote and git-open-remote - list remotes with a pattern
-        _list_remotes_completion() {
-            local cur="${COMP_WORDS[COMP_CWORD]}"
-            _list_remotes "$1"
-            COMPREPLY=(`compgen -W "${GIT_REMOTES[*]}" -- "$cur"`)
-            unset GIT_REMOTES
-        }
-
-        # completion for cdremote - list remotes with directories as URLs
-        _cdremote_complete() {
-            _list_remotes_completion '^\(file:/\|/\|\.\./\)' # (file:/ or / or ../ at the beginning)
-            if [ ${#COMPREPLY[*]} -eq 0 ]; then
-                _list_remotes_completion .
-            fi
-        }
+    # completion for aliases in global .gitconfig
+
+    # fixup rbi rbia rbiap rbip - do refs name completion
+    _git_fixup() { __gitcomp_nl "$(__git_refs)" ; }
+    _git_rbi() { __gitcomp_nl "$(__git_refs)" ; }
+    _git_rbia() { __gitcomp_nl "$(__git_refs)" ; }
+    _git_rbiap() { __gitcomp_nl "$(__git_refs)" ; }
+    _git_rbip() { __gitcomp_nl "$(__git_refs)" ; }
+    #
+    # push-to-all-remotes - do branch name completion
+    _git_push_to_all_remotes() { __gitcomp_nl "$(__git_heads)" ; }
+
+    _cdgitpath_complete() {
+        local cur="${COMP_WORDS[COMP_CWORD]}"
+        COMPREPLY=(`compgen -W "$(__git_config_get_set_variables)" -- "$cur"`)
+    }
 
-        complete -F _cdremote_complete cdremote
+    _git_open() {
+        _cdgitpath_complete
+    }
 
-        # completion for git-open-remote - list remotes with http(s) URLs
-        _git_open_remote() {
-            _list_remotes_completion '^http\(s\)\?://'
-            if [ ${#COMPREPLY[*]} -eq 0 ]; then
-                _list_remotes_completion .
+    complete -F _cdgitpath_complete cdgitpath git-open
+
+    # list remotes with URLs matching a regexp
+    _list_remotes() {
+        if [ $# -ne 1 ]; then
+            echo "Usage: _list_remotes remote_regexp" >&2
+            return 1
+        fi
+        declare -ag GIT_REMOTES=()
+        local remote
+        for remote in `git remote`; do
+            if git config --get remote.$remote.url | grep -q "$1"; then
+                GIT_REMOTES+=($remote)
             fi
-        }
+        done
+    }
 
-        complete -F _git_open_remote git-open-remote
-    fi
+    # completion for cdremote and git-open-remote - list remotes with a pattern
+    _list_remotes_completion() {
+        local cur="${COMP_WORDS[COMP_CWORD]}"
+        _list_remotes "$1"
+        COMPREPLY=(`compgen -W "${GIT_REMOTES[*]}" -- "$cur"`)
+        unset GIT_REMOTES
+    }
+
+    # completion for cdremote - list remotes with directories as URLs
+    _cdremote_complete() {
+        _list_remotes_completion '^\(file:/\|/\|\.\./\)' # (file:/ or / or ../ at the beginning)
+        if [ ${#COMPREPLY[*]} -eq 0 ]; then
+            _list_remotes_completion .
+        fi
+    }
+
+    complete -F _cdremote_complete cdremote
+
+    # completion for git-open-remote - list remotes with http(s) URLs
+    _git_open_remote() {
+        _list_remotes_completion '^http\(s\)\?://'
+        if [ ${#COMPREPLY[*]} -eq 0 ]; then
+            _list_remotes_completion .
+        fi
+    }
+
+    complete -F _git_open_remote git-open-remote
 fi