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.

diff --git a/.gitattributes b/.gitattributes
index 7193a7a4beb9ad1fa5608df10acd0c0235da7868..8df340caefc09c5e1d83422d0608a6e9b8334d2f 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -29,7 +29,7 @@ dangerfile.py                  export-ignore
 /tests/bench/names.csv          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
 /util/meson.build              -export-ignore
 /util/meson-system-test-init.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 ca88eaa8ced477a93989b5fcccd12c5121e18840..6aa6afa5e5056ed9fe4f3af4bf75c3c607868a68 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -373,7 +373,7 @@ stages:
     - meson compile -C build system-test-dependencies
     - test -z "${NO_BUILD_TEST_PREREQ}" && ninja -C build meson-test-prereq
     - test -z "${RUN_MESON_INSTALL}" || meson install -C build --destdir=$INSTALL_PATH
-    - test -z "${RUN_MESON_INSTALL}" || DESTDIR="${INSTALL_PATH}" sh build/util/check-make-install
+    - test -z "${RUN_MESON_INSTALL}" || DESTDIR="${INSTALL_PATH}" sh build/util/check-make-install.sh
     #- 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 build/lib/dns/gen | grep -F -q "ELF 64-bit LSB"
     #- test -z "${CROSS_COMPILATION}" || ( ! git ls-files -z --others --exclude lib/dns/gen | xargs -0 file | grep "ELF 64-bit LSB" )
@@ -618,7 +618,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
 
 meson-format:

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

diff --git a/util/meson.build b/util/meson.build
index ff9da84d90665f84aad967854ac0149a9bc38c84..f66f3c86bee69821f9f0c3d82664857b9f53439e 100644 (file)
--- a/util/meson.build
+++ b/util/meson.build
@@ -10,8 +10,8 @@
 # information regarding copyright ownership.
 
 configure_file(
-    input: 'check-make-install.in',
-    output: 'check-make-install',
+    input: 'check-make-install.sh.in',
+    output: 'check-make-install.sh',
     configuration: {
         'abs_builddir': meson.project_build_root(),
         'abs_top_srcdir': meson.project_source_root(),