From: Joel Rosdahl <joel@rosdahl.net>
Date: Sat, 20 Jun 2020 18:00:24 +0000 (+0200)
Subject: Improve naming of scripts
X-Git-Tag: v4.0~368
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8592189bf5ecf6cd1e9efbfc09c05f3e72dd29fa;p=thirdparty%2Fccache.git

Improve naming of scripts

- Use kebab case consistently.
- Remove redundant (and exposing an implementation detail) .sh extension
  for executables.
---

diff --git a/.travis.yml b/.travis.yml
index f26a82340..60b96362d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: cpp
 dist: bionic
 
-script: ci/build.sh
+script: ci/build
 
 jobs:
   include:
@@ -47,7 +47,7 @@ jobs:
         - elfutils
         - libzstd1-dev
     before_install:
-    - source ./misc/install_cuda.sh
+    - source ./ci/install-cuda.sh
 
   # Job 5: Build on Linux with 32-bit MinGW cross-compiler
   - os: linux
@@ -103,7 +103,7 @@ jobs:
 
   # Job 11: Build binary package, extract it out of source, run tests.
   - os: linux
-    env: T="Build binary and verify" VERBOSE=1 SPECIAL=build_and_verify_package
+    env: T="Build binary and verify" VERBOSE=1 SPECIAL=build-and-verify-package
     addons:
       apt:
         packages:
@@ -112,7 +112,7 @@ jobs:
 
   # Job 12: Build source package, extract it out of source, run tests.
   - os: linux
-    env: T="Build source package and verify" VERBOSE=1 SPECIAL=build_and_verify_package_source
+    env: T="Build source package and verify" VERBOSE=1 SPECIAL=build-and-verify-package-source
     addons:
       apt:
         packages:
diff --git a/ci/build.sh b/ci/build
similarity index 95%
rename from ci/build.sh
rename to ci/build
index 8ab28c88e..3b42db632 100755
--- a/ci/build.sh
+++ b/ci/build
@@ -2,7 +2,7 @@
 # This script is used by .travis.yml and build-in-docker
 
 if [ -n "${SPECIAL}" ]; then
-  sh ci/${SPECIAL}.sh
+  sh ci/${SPECIAL}
 else
   mkdir -p ${BUILDDIR:-build}
   cd ${BUILDDIR:-build}
diff --git a/ci/build_and_verify_package.sh b/ci/build-and-verify-package
similarity index 100%
rename from ci/build_and_verify_package.sh
rename to ci/build-and-verify-package
diff --git a/ci/build_and_verify_package_source.sh b/ci/build-and-verify-package-source
similarity index 100%
rename from ci/build_and_verify_package_source.sh
rename to ci/build-and-verify-package-source
diff --git a/misc/install_cuda.sh b/ci/install-cuda.sh
similarity index 100%
rename from misc/install_cuda.sh
rename to ci/install-cuda.sh
diff --git a/misc/build-in-docker b/misc/build-in-docker
index 47c6029a1..4a7e9d92e 100755
--- a/misc/build-in-docker
+++ b/misc/build-in-docker
@@ -1,13 +1,13 @@
 #!/bin/bash
 
-# This script runs ci/build.sh in a Docker container.
+# This script runs ci/build in a Docker container.
 #
 # Usage:
 #
 #   build-in-docker NAME [ARGUMENTS]
 #
 # NAME: Sudirectory name in the dockerfiles directory.
-# ARGUMENTS: Arguments that will be passed to ci/build.sh.
+# ARGUMENTS: Arguments that will be passed to ci/build.
 
 set -eu
 
@@ -42,4 +42,4 @@ docker run --rm \
   --env NO_TEST="${NO_TEST:-}" \
   --env CCACHE_DIR=/ccache \
   "$tag" \
-  /source/ci/build.sh "$@"
+  /source/ci/build "$@"
diff --git a/misc/check_format.sh b/misc/check-format
similarity index 100%
rename from misc/check_format.sh
rename to misc/check-format
diff --git a/misc/format.sh b/misc/format
similarity index 100%
rename from misc/format.sh
rename to misc/format
diff --git a/misc/update_authors.sh b/misc/update-authors
similarity index 100%
rename from misc/update_authors.sh
rename to misc/update-authors