build: Follow up cleanup and rename stuffs

Author: tesuji

.travis.yml

@@ -73,15 +73,14 @@ matrix:
       if: branch != master
       env: MACOSX_DEPLOYMENT_TARGET=10.7 TARGET=i686-apple-darwin
 
-    - name: clippy/rustup-init.sh
+    - name: rustfmt/clippy/rustup-init.sh/shellcheck
       language: minimal
       install:
         - |
           sh ./rustup-init.sh --default-toolchain=beta -y;
           . "$HOME"/.cargo/env;
-          rustup component add clippy;
+          rustup component add rustfmt clippy;
       script:
-        - cargo clippy --all --all-targets
         - |
           docker run \
             --volume "$TRAVIS_BUILD_DIR":/checkout:ro \
@@ -90,6 +89,11 @@ matrix:
             -it \
             centos:6 \
             sh ./ci/raw_init.sh;
+        - shellcheck -s dash -- rustup-init.sh;
+        - git ls-files -- '*.sh' | xargs shellcheck -s dash -e SC1090;
+        - git ls-files -- '*.bash' | xargs shellcheck -s bash -e SC1090;
+        - cargo fmt --all -- --check;
+        - cargo clippy --all --all-targets
       before_deploy:
       deploy:
 
@@ -120,23 +124,13 @@ script:
     esac
   - |
     if [ -n "$DOCKER" ]; then
-      sh ci/build-run-docker.sh "$DOCKER" "$TARGET" "$SKIP_TESTS";
+      bash ci/build-run-docker.bash "$DOCKER" "$TARGET" "$SKIP_TESTS";
     else
-      sh ci/run.sh;
-    fi
-
-  # Check the formatting last because test failures are more interesting to have
-  # discovered for contributors lacking some platform access for testing beforehand
-  - |
-    if [ "${TARGET}" = x86_64-unknown-linux-gnu ]; then
-      shellcheck -s dash -e SC1090 -- rustup-init.sh ci/*.sh;
-      rustup component add rustfmt;
-      rustfmt -vV;
-      cargo fmt --all -- --check;
+      bash ci/run.bash;
     fi
 
 before_deploy:
-  - sh ci/prepare-deploy-travis.sh
+  - bash ci/prepare-deploy-travis.bash
 
 deploy:
   - provider: s3

ci/build-run-docker.bash

@@ -3,7 +3,7 @@
 script_dir=$(cd "$(dirname "$0")" && pwd)
 root_dir="${script_dir}/.."
 
-. "${script_dir}/shared.sh"
+. "${script_dir}/shared.bash"
 
 set -e
 # Disable cause it makes shared script not to work properly
@@ -19,7 +19,7 @@ SKIP_TESTS="$3"
 
 travis_fold start "fetch.image.${TARGET}"
 travis_time_start
-travis_do_cmd sh ci/fetch-rust-docker.sh "${TARGET}"
+travis_do_cmd bash ci/fetch-rust-docker.bash "${TARGET}"
 travis_time_finish
 travis_fold end "fetch.image.${TARGET}"
 
@@ -52,7 +52,7 @@ docker run \
   --init \
   --rm \
   "${DOCKER}" \
-  -c 'PATH="${PATH}":/rustc-sysroot/bin sh ci/run.sh'
+  -c 'PATH="${PATH}":/rustc-sysroot/bin bash ci/run.bash'
 
 # check that rustup-init was built with ssl support
 # see https://github.com/rust-lang/rustup.rs/issues/1051

ci/deploy.bash

@@ -5,13 +5,13 @@
 # Usage:
 #
 # 1. Deploy the release on the dev environment:
-#    ./deploy.sh dev VERSION_NUMBER
+#    ./deploy.bash dev VERSION_NUMBER
 #
 # 2. Test everything works correctly:
 #    RUSTUP_UPDATE_ROOT=https://dev-static.rust-lang.org/rustup rustup self update
 #
 # 3. Deploy the release to the prod environment:
-#    ./deploy.sh prod VERSION_NUMBER
+#    ./deploy.bash prod VERSION_NUMBER
 
 set -euo pipefail
 IFS=$'\n\t'

ci/docker/android/Dockerfile

@@ -11,8 +11,8 @@ RUN apt-get update && \
     make \
     pkg-config
 
-COPY ci/docker/scripts/sccache.sh /scripts/
-RUN sh /scripts/sccache.sh
+COPY ci/docker/scripts/sccache.bash /scripts/
+RUN bash /scripts/sccache.bash
 
 RUN apt-get install -y --no-install-recommends \
     unzip \

ci/docker/x86_64-unknown-linux-musl/Dockerfile

@@ -1,6 +1,6 @@
 FROM ubuntu:18.04
 
-COPY ci/docker/scripts/sccache.sh /scripts/
+COPY ci/docker/scripts/sccache.bash /scripts/
 
 RUN \
   apt-get update && \
@@ -12,4 +12,4 @@ RUN \
     perl \
     make \
     gcc && \
-  sh /scripts/sccache.sh
+  bash /scripts/sccache.bash

ci/fetch-rust-docker.bash

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 script_dir=$(cd "$(dirname "$0")" && pwd)
-. "$script_dir/shared.sh"
+. "$script_dir/shared.bash"
 
 set -e
 # Disable cause it makes shared script not to work properly

ci/prepare-deploy-travis.bash

@@ -7,7 +7,7 @@ if [ "$TRAVIS_PULL_REQUEST" = "true" ] || [ "$TRAVIS_BRANCH" = "auto" ]; then
 fi
 
 # Copy rustup-init to rustup-setup for backwards compatibility
-cp target/"$TARGET"/release/rustup-init$EXE_EXT target/"$TARGET"/release/rustup-setup$EXE_EXT
+cp target/"$TARGET"/release/rustup-init"${EXE_EXT}" target/"$TARGET"/release/rustup-setup"${EXE_EXT}"
 
 # Generate hashes
 if [ "$TRAVIS_OS_NAME" = "osx" ]; then

ci/run.bash

@@ -1,31 +1,25 @@
-#!/bin/sh
+#!/bin/bash
 
 set -ex
 
-RUST_BACKTRACE=1
-export RUST_BACKTRACE
+export RUST_BACKTRACE=1
 
 rustc -vV
 cargo -vV
 
-if [ "$TRAVIS_OS_NAME" = "windows" ]; then
-  FEATURES=""
-else
-  FEATURES="--features vendored-openssl"
+FEATURES=()
+if [ "$TRAVIS_OS_NAME" != "windows" ]; then
+  FEATURES=('--features' 'vendored-openssl')
 fi
 
-# Sadly we need word splitting for $FEATURES
-# shellcheck disable=SC2086
-cargo build --locked -v --release --target "$TARGET" $FEATURES
+cargo build --locked -v --release --target "$TARGET" "${FEATURES[@]}"
 
 runtest () {
-  # shellcheck disable=SC2086
-  cargo test --release --target "$TARGET" $FEATURES "$@"
+  cargo test --release --target "$TARGET" "${FEATURES[@]}" "$@"
 }
 
 if [ -z "$SKIP_TESTS" ]; then
-  # shellcheck disable=SC2086
-  cargo run --locked --release --target "$TARGET" $FEATURES -- --dump-testament
+  cargo run --locked --release --target "$TARGET" "${FEATURES[@]}" -- --dump-testament
   runtest -p download
   runtest --bin rustup-init
   runtest --lib --all

ci/shared.bash

@@ -49,7 +49,7 @@ travis_nanoseconds() {
   local cmd='date'
   local format='+%s%N'
 
-  if command -v gdate >/dev/null 2>&1; then
+  if command -v gdate >/dev/null; then
     cmd='gdate'
   elif [ "$(uname)" = Darwin ]; then
     format='+%s000000000'

src/cli/download_tracker.rs

@@ -267,5 +267,4 @@ mod tests {
 
         assert_eq!(DownloadTracker::from_seconds(222_292), (2, 13, 44, 52));
     }
-
 }