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 3003b4d13e681eefe32ab786f8e09a4994160412..ab562d9e86bd78473c98b2531034358540ce359f 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/mksymtbl.pl              -export-ignore

diff --git a/.gitignore b/.gitignore
index fd4f120fd4bc971730ea3e0f4f4359217273d9f5..9edbf174530882be05891f1fb701d0c73b603e01 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 c4c9bdbab7e5f64857432a07d90060be60e728c6..919f6d50a4f79ebdb858cb5d138bbfeeb58e23e2 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -352,7 +352,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"
@@ -628,7 +628,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 e5db67749a26256ad7d7decf56807d9985d25d34..4ecc6a2bd60d6e3295244437e8f1904f24b0dff0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1538,7 +1538,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