lib/git: Fix coding styles

ohmybash · Oct 12, 2023 · 4d541cf · 4d541cf
1 parent a4e0ca1
commit 4d541cf
Showing 1 changed file with 89 additions and 99 deletions.
diff --git a/lib/git.sh b/lib/git.sh
@@ -6,71 +6,70 @@ _omb_module_require lib:omb-prompt-base
 
 # # Note: The same name of a functionis defined in omb-prompt-base.  We comment
 # # out this function for now.
-# function git_prompt_info() {
+# function git_prompt_info {
 #   local ref
-#   if [[ "$(_omb_prompt_git config --get oh-my-bash.hide-status 2>/dev/null)" != "1" ]]; then
+#   if [[ $(_omb_prompt_git config --get oh-my-bash.hide-status 2>/dev/null) != 1 ]]; then
 #     ref=$(_omb_prompt_git symbolic-ref HEAD 2> /dev/null) || \
 #     ref=$(_omb_prompt_git rev-parse --short HEAD 2> /dev/null) || return 0
 #     echo "$OSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$OSH_THEME_GIT_PROMPT_SUFFIX"
 #   fi
 # }
 
 # Checks if working tree is dirty
-function parse_git_dirty() {
-  local STATUS=''
-  local FLAGS
-  FLAGS=('--porcelain')
-  if [[ "$(_omb_prompt_git config --get oh-my-bash.hide-dirty)" != "1" ]]; then
-    if [[ $POST_1_7_2_GIT -gt 0 ]]; then
-      FLAGS+=( '--ignore-submodules=dirty' )
+function parse_git_dirty {
+  local STATUS=
+  local -a FLAGS=('--porcelain')
+  if [[ $(_omb_prompt_git config --get oh-my-bash.hide-dirty) != 1 ]]; then
+    if ((POST_1_7_2_GIT > 0)); then
+      FLAGS+=('--ignore-submodules=dirty')
     fi
-    if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" == "true" ]]; then
-      FLAGS+=( '--untracked-files=no' )
+    if [[ $DISABLE_UNTRACKED_FILES_DIRTY == "true" ]]; then
+      FLAGS+=('--untracked-files=no')
     fi
     STATUS=$(_omb_prompt_git status "${FLAGS[@]}" 2> /dev/null | tail -n1)
   fi
-  if [[ -n $STATUS ]]; then
+  if [[ $STATUS ]]; then
     echo "$OSH_THEME_GIT_PROMPT_DIRTY"
   else
     echo "$OSH_THEME_GIT_PROMPT_CLEAN"
   fi
 }
 
 # Gets the difference between the local and remote branches
-function git_remote_status() {
-  local remote ahead behind git_remote_status git_remote_status_detailed git_remote_origin
-  git_remote_origin=$(_omb_prompt_git rev-parse --verify ${hook_com[branch]}@{upstream} --symbolic-full-name 2>/dev/null)
-  remote=${git_remote_origin/refs\/remotes\//}
-  if [[ -n ${remote} ]]; then
-    ahead=$(_omb_prompt_git rev-list ${hook_com[branch]}@{upstream}..HEAD 2>/dev/null | wc -l)
-    behind=$(_omb_prompt_git rev-list HEAD..${hook_com[branch]}@{upstream} 2>/dev/null | wc -l)
-
-    if [[ $ahead -eq 0 ]] && [[ $behind -eq 0 ]]; then
-      git_remote_status="$OSH_THEME_GIT_PROMPT_EQUAL_REMOTE"
-    elif [[ $ahead -gt 0 ]] && [[ $behind -eq 0 ]]; then
-      git_remote_status="$OSH_THEME_GIT_PROMPT_AHEAD_REMOTE"
-      git_remote_status_detailed="$OSH_THEME_GIT_PROMPT_AHEAD_REMOTE_COLOR$OSH_THEME_GIT_PROMPT_AHEAD_REMOTE$((ahead))$_omb_prompt_reset_color"
-    elif [[ $behind -gt 0 ]] && [[ $ahead -eq 0 ]]; then
-      git_remote_status="$OSH_THEME_GIT_PROMPT_BEHIND_REMOTE"
-      git_remote_status_detailed="$OSH_THEME_GIT_PROMPT_BEHIND_REMOTE_COLOR$OSH_THEME_GIT_PROMPT_BEHIND_REMOTE$((behind))$_omb_prompt_reset_color"
-    elif [[ $ahead -gt 0 ]] && [[ $behind -gt 0 ]]; then
-      git_remote_status="$OSH_THEME_GIT_PROMPT_DIVERGED_REMOTE"
-      git_remote_status_detailed="$OSH_THEME_GIT_PROMPT_AHEAD_REMOTE_COLOR$OSH_THEME_GIT_PROMPT_AHEAD_REMOTE$((ahead))$_omb_prompt_reset_color$OSH_THEME_GIT_PROMPT_BEHIND_REMOTE_COLOR$OSH_THEME_GIT_PROMPT_BEHIND_REMOTE$((behind))$_omb_prompt_reset_color"
+function git_remote_status {
+  local git_remote_origin=$(_omb_prompt_git rev-parse --verify ${hook_com[branch]}@{upstream} --symbolic-full-name 2>/dev/null)
+  local remote=${git_remote_origin/refs\/remotes\//}
+  if [[ $remote ]]; then
+    local ahead=$(_omb_prompt_git rev-list ${hook_com[branch]}@{upstream}..HEAD 2>/dev/null | wc -l)
+    local behind=$(_omb_prompt_git rev-list HEAD..${hook_com[branch]}@{upstream} 2>/dev/null | wc -l)
+
+    local git_remote_status git_remote_status_detailed
+    if ((ahead == 0 && behind == 0)); then
+      git_remote_status=$OSH_THEME_GIT_PROMPT_EQUAL_REMOTE
+    elif ((ahead > 0 && behind == 0)); then
+      git_remote_status=$OSH_THEME_GIT_PROMPT_AHEAD_REMOTE
+      git_remote_status_detailed=$OSH_THEME_GIT_PROMPT_AHEAD_REMOTE_COLOR$OSH_THEME_GIT_PROMPT_AHEAD_REMOTE$((ahead))$_omb_prompt_reset_color
+    elif ((behind > 0 && ahead == 0)); then
+      git_remote_status=$OSH_THEME_GIT_PROMPT_BEHIND_REMOTE
+      git_remote_status_detailed=$OSH_THEME_GIT_PROMPT_BEHIND_REMOTE_COLOR$OSH_THEME_GIT_PROMPT_BEHIND_REMOTE$((behind))$_omb_prompt_reset_color
+    elif ((ahead > 0 && behind > 0)); then
+      git_remote_status=$OSH_THEME_GIT_PROMPT_DIVERGED_REMOTE
+      git_remote_status_detailed=$OSH_THEME_GIT_PROMPT_AHEAD_REMOTE_COLOR$OSH_THEME_GIT_PROMPT_AHEAD_REMOTE$((ahead))$_omb_prompt_reset_color$OSH_THEME_GIT_PROMPT_BEHIND_REMOTE_COLOR$OSH_THEME_GIT_PROMPT_BEHIND_REMOTE$((behind))$_omb_prompt_reset_color
     fi
 
-    if [[ -n $OSH_THEME_GIT_PROMPT_REMOTE_STATUS_DETAILED ]]; then
-      git_remote_status="$OSH_THEME_GIT_PROMPT_REMOTE_STATUS_PREFIX$remote$git_remote_status_detailed$OSH_THEME_GIT_PROMPT_REMOTE_STATUS_SUFFIX"
+    if [[ $OSH_THEME_GIT_PROMPT_REMOTE_STATUS_DETAILED ]]; then
+      git_remote_status=$OSH_THEME_GIT_PROMPT_REMOTE_STATUS_PREFIX$remote$git_remote_status_detailed$OSH_THEME_GIT_PROMPT_REMOTE_STATUS_SUFFIX
     fi
 
-    echo $git_remote_status
+    echo "$git_remote_status"
   fi
 }
 
 # Outputs the name of the current branch
 # Usage example: git pull origin $(git_current_branch)
 # Using '--quiet' with 'symbolic-ref' will not cause a fatal error (128) if
 # it's not a symbolic ref, but in a Git repo.
-function git_current_branch() {
+function git_current_branch {
   local ref
   ref=$(_omb_prompt_git symbolic-ref --quiet HEAD 2> /dev/null)
   local ret=$?
@@ -83,112 +82,103 @@ function git_current_branch() {
 
 
 # Gets the number of commits ahead from remote
-function git_commits_ahead() {
+function git_commits_ahead {
   if _omb_prompt_git rev-parse --git-dir &>/dev/null; then
-    local commits="$(_omb_prompt_git rev-list --count @{upstream}..HEAD)"
-    if [[ "$commits" != 0 ]]; then
+    local commits=$(_omb_prompt_git rev-list --count @{upstream}..HEAD)
+    if ((commits != 0)); then
       echo "$OSH_THEME_GIT_COMMITS_AHEAD_PREFIX$commits$OSH_THEME_GIT_COMMITS_AHEAD_SUFFIX"
     fi
   fi
 }
 
 # Gets the number of commits behind remote
-function git_commits_behind() {
+function git_commits_behind {
   if _omb_prompt_git rev-parse --git-dir &>/dev/null; then
-    local commits="$(_omb_prompt_git rev-list --count HEAD..@{upstream})"
-    if [[ "$commits" != 0 ]]; then
+    local commits=$(_omb_prompt_git rev-list --count HEAD..@{upstream})
+    if ((commits != 0)); then
       echo "$OSH_THEME_GIT_COMMITS_BEHIND_PREFIX$commits$OSH_THEME_GIT_COMMITS_BEHIND_SUFFIX"
     fi
   fi
 }
 
 # Outputs if current branch is ahead of remote
-function git_prompt_ahead() {
-  if [[ -n "$(_omb_prompt_git rev-list origin/$(git_current_branch)..HEAD 2> /dev/null)" ]]; then
+function git_prompt_ahead {
+  if [[ $(_omb_prompt_git rev-list origin/$(git_current_branch)..HEAD 2> /dev/null) ]]; then
     echo "$OSH_THEME_GIT_PROMPT_AHEAD"
   fi
 }
 
 # Outputs if current branch is behind remote
-function git_prompt_behind() {
-  if [[ -n "$(_omb_prompt_git rev-list HEAD..origin/$(git_current_branch) 2> /dev/null)" ]]; then
+function git_prompt_behind {
+  if [[ $(_omb_prompt_git rev-list HEAD..origin/$(git_current_branch) 2> /dev/null) ]]; then
     echo "$OSH_THEME_GIT_PROMPT_BEHIND"
   fi
 }
 
 # Outputs if current branch exists on remote or not
-function git_prompt_remote() {
-  if [[ -n "$(_omb_prompt_git show-ref origin/$(git_current_branch) 2> /dev/null)" ]]; then
+function git_prompt_remote {
+  if [[ $(_omb_prompt_git show-ref origin/$(git_current_branch) 2> /dev/null) ]]; then
     echo "$OSH_THEME_GIT_PROMPT_REMOTE_EXISTS"
   else
     echo "$OSH_THEME_GIT_PROMPT_REMOTE_MISSING"
   fi
 }
 
 # Formats prompt string for current git commit short SHA
-function git_prompt_short_sha() {
+function git_prompt_short_sha {
   local SHA
-  SHA=$(_omb_prompt_git rev-parse --short HEAD 2> /dev/null) && echo "$OSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$OSH_THEME_GIT_PROMPT_SHA_AFTER"
+  SHA=$(_omb_prompt_git rev-parse --short HEAD 2> /dev/null) &&
+    echo "$OSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$OSH_THEME_GIT_PROMPT_SHA_AFTER"
 }
 
 # Formats prompt string for current git commit long SHA
-function git_prompt_long_sha() {
+function git_prompt_long_sha {
   local SHA
-  SHA=$(_omb_prompt_git rev-parse HEAD 2> /dev/null) && echo "$OSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$OSH_THEME_GIT_PROMPT_SHA_AFTER"
+  SHA=$(_omb_prompt_git rev-parse HEAD 2> /dev/null) &&
+    echo "$OSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$OSH_THEME_GIT_PROMPT_SHA_AFTER"
 }
 
 # Get the status of the working tree
-function git_prompt_status() {
-  local INDEX STATUS
-  INDEX=$(_omb_prompt_git status --porcelain -b 2> /dev/null)
-  STATUS=""
-  if $(echo "$INDEX" | command grep -E '^\?\? ' &> /dev/null); then
-    STATUS="$OSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
-  fi
-  if $(echo "$INDEX" | grep '^A  ' &> /dev/null); then
-    STATUS="$OSH_THEME_GIT_PROMPT_ADDED$STATUS"
-  elif $(echo "$INDEX" | grep '^M  ' &> /dev/null); then
-    STATUS="$OSH_THEME_GIT_PROMPT_ADDED$STATUS"
-  fi
-  if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then
-    STATUS="$OSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
-  elif $(echo "$INDEX" | grep '^AM ' &> /dev/null); then
-    STATUS="$OSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
-  elif $(echo "$INDEX" | grep '^ T ' &> /dev/null); then
-    STATUS="$OSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
-  fi
-  if $(echo "$INDEX" | grep '^R  ' &> /dev/null); then
-    STATUS="$OSH_THEME_GIT_PROMPT_RENAMED$STATUS"
-  fi
-  if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
-    STATUS="$OSH_THEME_GIT_PROMPT_DELETED$STATUS"
-  elif $(echo "$INDEX" | grep '^D  ' &> /dev/null); then
-    STATUS="$OSH_THEME_GIT_PROMPT_DELETED$STATUS"
-  elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then
-    STATUS="$OSH_THEME_GIT_PROMPT_DELETED$STATUS"
-  fi
-  if $(_omb_prompt_git rev-parse --verify refs/stash >/dev/null 2>&1); then
-    STATUS="$OSH_THEME_GIT_PROMPT_STASHED$STATUS"
-  fi
-  if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
-    STATUS="$OSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
-  fi
-  if $(echo "$INDEX" | grep '^## [^ ]\+ .*ahead' &> /dev/null); then
-    STATUS="$OSH_THEME_GIT_PROMPT_AHEAD$STATUS"
-  fi
-  if $(echo "$INDEX" | grep '^## [^ ]\+ .*behind' &> /dev/null); then
-    STATUS="$OSH_THEME_GIT_PROMPT_BEHIND$STATUS"
-  fi
-  if $(echo "$INDEX" | grep '^## [^ ]\+ .*diverged' &> /dev/null); then
-    STATUS="$OSH_THEME_GIT_PROMPT_DIVERGED$STATUS"
-  fi
-  echo $STATUS
+function git_prompt_status {
+  local INDEX=$(_omb_prompt_git status --porcelain -b 2> /dev/null)
+  local STATUS=
+  if command grep -qE '^\?\? ' <<< "$INDEX"; then
+    STATUS=$OSH_THEME_GIT_PROMPT_UNTRACKED$STATUS
+  fi
+  if command grep -q '^[AM]  ' <<< "$INDEX"; then
+    STATUS=$OSH_THEME_GIT_PROMPT_ADDED$STATUS
+  fi
+  if command grep -qE '^[ A]M |^ T ' <<< "$INDEX"; then
+    STATUS=$OSH_THEME_GIT_PROMPT_MODIFIED$STATUS
+  fi
+  if command grep -q '^R  ' <<< "$INDEX"; then
+    STATUS=$OSH_THEME_GIT_PROMPT_RENAMED$STATUS
+  fi
+  if command grep -qE '^[ A]D |D  ' <<< "$INDEX"; then
+    STATUS=$OSH_THEME_GIT_PROMPT_DELETED$STATUS
+  fi
+  if _omb_prompt_git rev-parse --verify refs/stash &> /dev/null; then
+    STATUS=$OSH_THEME_GIT_PROMPT_STASHED$STATUS
+  fi
+  if command grep -q '^UU ' <<< "$INDEX"; then
+    STATUS=$OSH_THEME_GIT_PROMPT_UNMERGED$STATUS
+  fi
+  if command grep -q '^## [^ ]\+ .*ahead' <<< "$INDEX"; then
+    STATUS=$OSH_THEME_GIT_PROMPT_AHEAD$STATUS
+  fi
+  if command grep -q '^## [^ ]\+ .*behind' <<< "$INDEX"; then
+    STATUS=$OSH_THEME_GIT_PROMPT_BEHIND$STATUS
+  fi
+  if command grep -q '^## [^ ]\+ .*diverged' <<< "$INDEX"; then
+    STATUS=$OSH_THEME_GIT_PROMPT_DIVERGED$STATUS
+  fi
+  echo "$STATUS"
 }
 
 # Compares the provided version of git to the version installed and on path
 # Outputs -1, 0, or 1 if the installed version is less than, equal to, or
 # greater than the input version, respectively.
-function git_compare_version() {
+function git_compare_version {
   local INPUT_GIT_VERSION INSTALLED_GIT_VERSION
   _omb_util_split INPUT_GIT_VERSION "$1" '.'
   _omb_util_split INSTALLED_GIT_VERSION "$(_omb_prompt_git --version 2>/dev/null)"
@@ -210,13 +200,13 @@ function git_compare_version() {
 
 # Outputs the name of the current user
 # Usage example: $(git_current_user_name)
-function git_current_user_name() {
+function git_current_user_name {
   _omb_prompt_git config user.name 2>/dev/null
 }
 
 # Outputs the email of the current user
 # Usage example: $(git_current_user_email)
-function git_current_user_email() {
+function git_current_user_email {
   _omb_prompt_git config user.email 2>/dev/null
 }