fix strict bash pipefail

deadc0de6 · Nov 9, 2023 · 94d97bf · 94d97bf
1 parent 7bd1d7f
commit 94d97bf
Show file tree

Hide file tree

Showing 152 changed files with 166 additions and 162 deletions.
diff --git a/completion/generate.sh b/completion/generate.sh
@@ -5,7 +5,7 @@
 # pip3 install --user infi.docopt_completion
 #
 
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 
 bin="docopt-completion"
 if ! hash ${bin}; then

diff --git a/dotdrop/dotfile.py b/dotdrop/dotfile.py
@@ -141,23 +141,23 @@ def prt(self):
         some = self.get_pre_actions()
         if some:
             for act in some:
-                out += f'\n{2*indent}- {act}'
+                out += f'\n{2 * indent}- {act}'
 
         out += f'\n{indent}post-action:'
         some = self.get_post_actions()
         if some:
             for act in some:
-                out += f'\n{2*indent}- {act}'
+                out += f'\n{2 * indent}- {act}'
 
         out += f'\n{indent}trans_install:'
         some = self.get_trans_install()
         if some:
-            out += f'\n{2*indent}- {some}'
+            out += f'\n{2 * indent}- {some}'
 
         out += f'\n{indent}trans_update:'
         some = self.get_trans_update()
         if some:
-            out += f'\n{2*indent}- {some}'
+            out += f'\n{2 * indent}- {some}'
         return out
 
     def __repr__(self):

diff --git a/scripts/check-doc.sh b/scripts/check-doc.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2022, deadc0de6
 
 # stop on first error
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 
 ## test doc external links
 echo "------------------------"

diff --git a/scripts/check-syntax.sh b/scripts/check-syntax.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2022, deadc0de6
 
 # stop on first error
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 
 # ensure binaries are here
 if ! which shellcheck >/dev/null 2>&1; then
@@ -50,7 +50,8 @@ echo "---------------------------------"
 echo "checking for bash strict mode"
 find tests-ng -iname '*.sh' | while read -r script; do
   #grep 'set +e' "${script}" 2>&1 >/dev/null && echo "set +e found in ${script}" && exit 1
-  grep 'set -euo errtrace pipefail' "${script}" >/dev/null 2>&1 || (echo "set -euo errtrace pipefail not set in ${script}" && exit 1 )
+  grep 'set -eu -o errtrace -o pipefail' "${script}" >/dev/null 2>&1 || \
+    (echo "\"set -eu -o errtrace -o pipefail\" not set in ${script}" && exit 1 )
 done
 
 # PEP8 tests

diff --git a/scripts/check-tests-ng.sh b/scripts/check-tests-ng.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2023, deadc0de6
 
 # stop on first error
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 
 tmpworkdir="/tmp/dotdrop-tests-workdir"
 export DOTDROP_WORKDIR="${tmpworkdir}"

diff --git a/scripts/check-unittests.sh b/scripts/check-unittests.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2023, deadc0de6
 
 # stop on first error
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 
 WORKERS=${DOTDROP_WORKERS:-}
 if [ -n "${WORKERS}" ]; then

diff --git a/tests-ng/actions-args-template.sh b/tests-ng/actions-args-template.sh
@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

diff --git a/tests-ng/actions-args.sh b/tests-ng/actions-args.sh
@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

diff --git a/tests-ng/actions-default.sh b/tests-ng/actions-default.sh
@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

diff --git a/tests-ng/actions-empty-dir.sh b/tests-ng/actions-empty-dir.sh
@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

diff --git a/tests-ng/actions-pre.sh b/tests-ng/actions-pre.sh
@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

diff --git a/tests-ng/actions-template.sh b/tests-ng/actions-template.sh
@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

diff --git a/tests-ng/actions.sh b/tests-ng/actions.sh
@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

diff --git a/tests-ng/backup.sh b/tests-ng/backup.sh
@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

diff --git a/tests-ng/bad-diff-cmd.sh b/tests-ng/bad-diff-cmd.sh
@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

diff --git a/tests-ng/chmod-compare.sh b/tests-ng/chmod-compare.sh
@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

diff --git a/tests-ng/chmod-import.sh b/tests-ng/chmod-import.sh
@@ -8,7 +8,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"
@@ -194,7 +194,7 @@ cat "${cfg}"
 # list files
 cd "${ddpath}" | ${bin} detail -c "${cfg}" -p p1 -V
 
-cnt=$(cat "${cfg}" | grep chmod | wc -l)
+cnt=$(cat "${cfg}" | (grep chmod || :) | wc -l)
 [ "${cnt}" != "0" ] && echo "chmod inserted but not needed" && exit 1
 
 ## with config option chmod_on_import

diff --git a/tests-ng/chmod-install-dir.sh b/tests-ng/chmod-install-dir.sh
@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

diff --git a/tests-ng/chmod-install.sh b/tests-ng/chmod-install.sh
@@ -8,7 +8,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

diff --git a/tests-ng/chmod-more.sh b/tests-ng/chmod-more.sh
@@ -8,7 +8,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

diff --git a/tests-ng/chmod-preserve-install.sh b/tests-ng/chmod-preserve-install.sh
@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

diff --git a/tests-ng/chmod-preserve-update.sh b/tests-ng/chmod-preserve-update.sh
@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"
@@ -120,15 +120,19 @@ profiles:
 _EOF
 #cat ${cfg}
 
-echo "update"
+echo "update1"
 cd "${ddpath}" | ${bin} update -f -c "${cfg}" -p p1 -V "${tmpd}"/exists
+echo "update2"
 cd "${ddpath}" | ${bin} update -f -c "${cfg}" -p p1 -V "${tmpd}"/existslink
+echo "update3"
 cd "${ddpath}" | ${bin} update -f -c "${cfg}" -p p1 -V "${tmpd}"/direxists
+echo "update4"
 cd "${ddpath}" | ${bin} update -f -c "${cfg}" -p p1 -V "${tmpd}"/linkchildren
+echo "update5"
 cd "${ddpath}" | ${bin} update -f -c "${cfg}" -p p1 -V "${tmpd}"/nomode
 
-count=$(cat "${cfg}" | grep chmod | grep -v 'chmod: preserve\|force_chmod' | wc -l)
-echo "${count}"
+count=$(grep chmod "${cfg}" | (grep -v 'preserve\|force_chmod' || :) | wc -l)
+echo "chmod changed: ${count}"
 [ "${count}" != "0" ] && echo "chmod altered" && exit 1
 
 echo "OK"

diff --git a/tests-ng/chmod-update.sh b/tests-ng/chmod-update.sh
@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"
@@ -80,7 +80,7 @@ done
 cat "${cfg}"
 
 # test no chmod
-cnt=$(cat "${cfg}" | grep chmod | wc -l)
+cnt=$(cat "${cfg}" | ( grep chmod || : ) | wc -l)
 [ "${cnt}" != "0" ] && echo "chmod wrongly inserted" && exit 1
 
 ######################

diff --git a/tests-ng/clear-workdir.sh b/tests-ng/clear-workdir.sh
@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

diff --git a/tests-ng/compare-diff-types.sh b/tests-ng/compare-diff-types.sh
@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

diff --git a/tests-ng/compare-global-negative-ignore.sh b/tests-ng/compare-global-negative-ignore.sh
@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

diff --git a/tests-ng/compare-ignore-in-dotpath.sh b/tests-ng/compare-ignore-in-dotpath.sh
@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

diff --git a/tests-ng/compare-ignore-missing.sh b/tests-ng/compare-ignore-missing.sh
@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

diff --git a/tests-ng/compare-ignore-relative.sh b/tests-ng/compare-ignore-relative.sh
@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

diff --git a/tests-ng/compare-ignore.sh b/tests-ng/compare-ignore.sh
@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

diff --git a/tests-ng/compare-include.sh b/tests-ng/compare-include.sh
@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

diff --git a/tests-ng/compare-negative-ignore-all-but.sh b/tests-ng/compare-negative-ignore-all-but.sh
@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

diff --git a/tests-ng/compare-negative-ignore-relative.sh b/tests-ng/compare-negative-ignore-relative.sh
@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

diff --git a/tests-ng/compare-negative-ignore.sh b/tests-ng/compare-negative-ignore.sh
@@ -7,7 +7,7 @@
 #
 
 # exit on first error
-#set -euo errtrace pipefail
+#set -eu -o errtrace -o pipefail
 
 cur=$(cd "$(dirname "${0}")" && pwd)
 

diff --git a/tests-ng/compare-profile-check.sh b/tests-ng/compare-profile-check.sh
@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

diff --git a/tests-ng/compare.sh b/tests-ng/compare.sh
@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"