From 42da15c1fbff60c4a49705b96ebb30721ccafb14 Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Sat, 2 Apr 2022 08:18:01 +0300
Subject: bash: best practices & linting

---
 %HOME%/.bash_utils/git.sh | 46 +++++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 19 deletions(-)

(limited to '%HOME%/.bash_utils/git.sh')

diff --git a/%HOME%/.bash_utils/git.sh b/%HOME%/.bash_utils/git.sh
index e366f07..021e0e8 100644
--- a/%HOME%/.bash_utils/git.sh
+++ b/%HOME%/.bash_utils/git.sh
@@ -12,9 +12,15 @@ alias repo_branches='git for-each-ref '"'"'--format=%(refname:short)'"'"' refs/h
 
 workdir_is_clean() (
     set -o errexit -o nounset -o pipefail
+    shopt -s inherit_errexit
+
     local status
     status="$( git status --porcelain )"
-    test -z "$status"
+
+    if [ -n "$status" ]; then
+        echo "${FUNCNAME[0]}: repository isn't clean" >&2
+        return 1
+    fi
 )
 
 alias workdir_clean_all='git clean -fdx'
@@ -22,16 +28,14 @@ alias workdir_clean_ignored='git clean -fdX'
 
 branch_eol_normalized() (
     set -o errexit -o nounset -o pipefail
+    shopt -s inherit_errexit lastpipe
 
-    if ! workdir_is_clean; then
-        echo "${FUNCNAME[0]}: repository isn't clean" >&2
-        return 1
-    fi
+    workdir_is_clean
 
     local normalized=0
 
     local line
-    while IFS= read -d '' -r line; do
+    git ls-files -z --eol | while IFS= read -d '' -r line; do
         local eolinfo
         if ! eolinfo="$( expr "$line" : 'i/\([^ ]*\)' )"; then
             echo "${FUNCNAME[0]}: couldn't extract eolinfo from: $line" >&2
@@ -53,28 +57,27 @@ branch_eol_normalized() (
         fi
 
         normalized=1
-    done < <( git ls-files -z --eol )
+    done
 
     return "$normalized"
 )
 
 repo_eol_normalized() (
     set -o errexit -o nounset -o pipefail
+    shopt -s inherit_errexit lastpipe
 
-    if ! workdir_is_clean; then
-        echo "${FUNCNAME[0]}: repository isn't clean" >&2
-        return 1
-    fi
+    workdir_is_clean
 
     local branch
-    while IFS= read -r branch; do
+    repo_branches | while IFS= read -r branch; do
         git checkout --quiet "$branch"
         branch_eol_normalized "$branch"
-    done < <( repo_branches )
+    done
 )
 
 workdir_tighten_permissions() (
     set -o errexit -o nounset -o pipefail
+    shopt -s inherit_errexit
 
     branch_files -z | xargs -0 -- chmod 0600 --
     branch_dirs  -z | xargs -0 -- chmod 0700 --
@@ -83,32 +86,35 @@ workdir_tighten_permissions() (
 
 branch_doslint() (
     set -o errexit -o nounset -o pipefail
+    shopt -s inherit_errexit lastpipe
 
     local -a paths
-    local path
 
-    while IFS= read -d '' -r path; do
+    local path
+    branch_files -z | while IFS= read -d '' -r path; do
         paths+=("$path")
-    done < <( branch_files -z )
+    done
 
     doslint ${paths[@]+"${paths[@]}"}
 )
 
 branch_lint() (
     set -o errexit -o nounset -o pipefail
+    shopt -s inherit_errexit lastpipe
 
     local -a paths
-    local path
 
-    while IFS= read -d '' -r path; do
+    local path
+    branch_files -z | while IFS= read -d '' -r path; do
         paths+=("$path")
-    done < <( branch_files -z )
+    done
 
     lint ${paths[@]+"${paths[@]}"}
 )
 
 branch_backup() (
     set -o errexit -o nounset -o pipefail
+    shopt -s inherit_errexit
 
     local repo_dir
     repo_dir="$( pwd )"
@@ -135,6 +141,8 @@ branch_backup() (
 
 branch_backup_dropbox() (
     set -o errexit -o nounset -o pipefail
+    shopt -s inherit_errexit
+
     branch_backup "$USERPROFILE/Dropbox/backups"
 )
 
-- 
cgit v1.2.3