test: sync shfmt and shellcheck configs

scop · May 11, 2020 · c21e0e1 · c21e0e1
1 parent ead40fa
commit c21e0e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -40,15 +40,15 @@ repos:
         entry: shfmt
         args: [-w, -s]
         types: [text]
-        files: ^(bash_completion|completions/[^.].*|test/(config/bashrc|update-test-cmd-list)|.+\.sh(\.in)?)$
-        exclude: ^completions/Makefile*
+        files: ^(bash_completion|completions/.+|test/(config/bashrc|update-test-cmd-list)|.+\.sh(\.in)?)$
+        exclude: ^completions/(\.gitignore|Makefile.*)$
   - repo: https://github.com/ryanrhee/shellcheck-py
     rev: v0.7.1.1
     hooks:
       - id: shellcheck
         args: [-f, gcc]
         types: [text]
-        files: ^(bash_completion|completions/.+|test/run*|.+\.sh(\.in)?)$
+        files: ^(bash_completion|completions/.+|test/(config/bashrc|update-test-cmd-list)|.+\.sh(\.in)?)$
         exclude: completions/(\.gitignore|Makefile.*)$
         require_serial: false  # We disable SC1090 anyway, so parallel is ok
   - repo: https://github.com/perltidy/perltidy

diff --git a/test/config/bashrc b/test/config/bashrc
@@ -33,7 +33,7 @@ export BASH_COMPLETION_USER_FILE=/dev/null
 # found in any completion dirs. Therefore we also point the "system" dirs to
 # locations that should not yield valid completions and helpers paths either.
 export BASH_COMPLETION_USER_DIR=$(
-    cd "$SRCDIR/.."
+    cd "$SRCDIR/.." || exit 1
     pwd
 )
 # /var/empty isn't necessarily actually always empty :P