Add .sh extension to shell scripts

Use .sh(.in) file extension consistently for shell scripts
to allow more reliable detection of shell scripts based on their file
extension.

(cherry picked from commit 2d690499dd5092450d2d6f73d06a7937cd865c07)

diff --git a/.gitattributes b/.gitattributes
index 770cf77f1988340b868b4e2d55c56b3842451d28..8e1a8be68f49fcd00fc0bf89459d18bfc7c6b6f8 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,5 +9,5 @@
 /doc/dev                        export-ignore
 /util/**                        export-ignore
 /util/bindkeys.pl              -export-ignore
-/util/check-make-install.in    -export-ignore
+/util/check-make-install.sh.in -export-ignore
 /util/dtrace.sh                -export-ignore

diff --git a/.gitignore b/.gitignore
index 9f315a88e5c821ac99dec1e54d82d48214c11013..805c52cc5cebb9f80bd09564298a6f49b618d3fe 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -65,7 +65,7 @@ timestamp
 # Gets generated by Build Ear (bear)
 /compile_commands.commands.json
 /tsan
-/util/check-make-install
+/util/check-make-install.sh
 /INSTALL
 doc/man/dnssec-cds.8in
 doc/man/dnssec-checkds.8in

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b9ccdc5e52f5c983bf55d79b75d48afbed886494..f7f1bdad5eb2302ea1daa8c5ac6cfa879dc2766a 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -395,7 +395,7 @@ stages:
     - *check_readline_setup
     - make -j${BUILD_PARALLEL_JOBS:-1} -k all V=1
     - test -z "${RUN_MAKE_INSTALL}" || make DESTDIR="${INSTALL_PATH}" install
-    - test -z "${RUN_MAKE_INSTALL}" || DESTDIR="${INSTALL_PATH}" sh util/check-make-install
+    - test -z "${RUN_MAKE_INSTALL}" || DESTDIR="${INSTALL_PATH}" sh util/check-make-install.sh
     - if [[ "${CFLAGS}" == *"-fsanitize=address"* ]]; then ( ! grep -F AddressSanitizer config.log ); fi
     - test -z "${CROSS_COMPILATION}" || grep -F -A 1 "checking whether we are cross compiling" config.log | grep -q "result.*yes"
     - test -z "${CROSS_COMPILATION}" || file lib/dns/gen | grep -F -q "ELF 64-bit LSB"
@@ -674,7 +674,7 @@ coccinelle:
   <<: *precheck_job
   needs: []
   script:
-    - util/check-cocci
+    - util/check-cocci.sh
     - if test "$(git status --porcelain | grep -Ev '\?\?' | wc -l)" -gt "0"; then git status --short; exit 1; fi
 
 doctest:

diff --git a/configure.ac b/configure.ac
index 30612c894f3809df4db87ae2434b4a0114ebd1a8..34895e9b463d2d0386cdf3d33d64d75f0014c087 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1669,7 +1669,7 @@ AC_CONFIG_FILES([fuzz/Makefile])
 
 # Misc
 
-AC_CONFIG_FILES([util/check-make-install])
+AC_CONFIG_FILES([util/check-make-install.sh])
 
 #
 # Do it

diff --git a/util/check-cocci b/util/check-cocci.sh
similarity index 100%
rename from util/check-cocci
rename to util/check-cocci.sh

diff --git a/util/check-make-install.in b/util/check-make-install.sh.in
similarity index 100%
rename from util/check-make-install.in
rename to util/check-make-install.sh.in