From 4509f8b9d42a1823b6ab22a8a5c7843fc23a04da Mon Sep 17 00:00:00 2001
From: Daniel Schischkin <daniel@schischkin.info>
Date: Thu, 3 Feb 2022 18:14:57 +0000
Subject: [PATCH] Remove file ending of shellcheck_all and
 downgrade_dependencies script

---
 .cargo-husky/hooks/pre-push                                 | 4 ++--
 .gitlab-ci.yml                                              | 5 +++--
 maint/{downgrade_dependencies.sh => downgrade_dependencies} | 0
 maint/shellcheck_all                                        | 3 +++
 maint/shellcheck_all.sh                                     | 3 ---
 5 files changed, 8 insertions(+), 7 deletions(-)
 rename maint/{downgrade_dependencies.sh => downgrade_dependencies} (100%)
 create mode 100755 maint/shellcheck_all
 delete mode 100755 maint/shellcheck_all.sh

diff --git a/.cargo-husky/hooks/pre-push b/.cargo-husky/hooks/pre-push
index 2aebf64c8..f13e3be9e 100755
--- a/.cargo-husky/hooks/pre-push
+++ b/.cargo-husky/hooks/pre-push
@@ -14,5 +14,5 @@ cargo clippy --all-features --all-targets -- -D warnings
 echo '+cargo test --all'
 cargo test --all
 
-echo '+./maint/shellcheck_all.sh'
-./maint/shellcheck_all.sh
+echo '+./maint/shellcheck_all'
+./maint/shellcheck_all
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc4d6086c..b731ed0ec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,8 @@ shellcheck:
   stage: check
   image: koalaman/shellcheck-alpine
   script:
-    - ./maint/shellcheck_all.sh
+    - apk add git
+    - ./maint/shellcheck_all
 
 rust-latest:
   stage: build
@@ -99,7 +100,7 @@ minimal-versions:
   image: rust:1.53
   script:
     - rustup install nightly
-    - ./maint/downgrade_dependencies.sh
+    - ./maint/downgrade_dependencies
     - cargo build --verbose --target x86_64-unknown-linux-gnu --all-features
     - cargo test --verbose --target x86_64-unknown-linux-gnu --all-features
   tags:
diff --git a/maint/downgrade_dependencies.sh b/maint/downgrade_dependencies
similarity index 100%
rename from maint/downgrade_dependencies.sh
rename to maint/downgrade_dependencies
diff --git a/maint/shellcheck_all b/maint/shellcheck_all
new file mode 100755
index 000000000..0c7fc7fa3
--- /dev/null
+++ b/maint/shellcheck_all
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+git grep -P --line-number '^#! ?/bin/(:?ba)?sh\b' | sed -n 's/:1:[^:]*$//p' | xargs shellcheck
diff --git a/maint/shellcheck_all.sh b/maint/shellcheck_all.sh
deleted file mode 100755
index 372868ea5..000000000
--- a/maint/shellcheck_all.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-shellcheck ./**/*.sh