Merge pull request #4108 from tgross35/set-u

Set `-u` (error on unset) in all script files

ci/android-install-ndk.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-set -ex
+set -eux
 
 ndk=android-ndk-r27
 wget --tries=20 -q "https://dl.google.com/android/repository/${ndk}-linux.zip"

ci/android-install-sdk.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-set -ex
+set -eux
 
 # Prep the SDK and emulator
 #

ci/android-sysimage.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -ex
+set -eux
 
 URL=https://dl.google.com/android/repository/sys-img/android
 

ci/build.sh

@@ -5,7 +5,7 @@
 # The FILTER environment variable can be used to select which target(s) to build.
 # For example: set FILTER to vxworks to select the targets that has vxworks in name
 
-set -ex
+set -eux
 
 : "${TOOLCHAIN?The TOOLCHAIN environment variable must be set.}"
 : "${OS?The OS environment variable must be set.}"

ci/docker/wasm32-unknown-emscripten/node-wrapper.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -eux
 
 me="$1"
 shift

ci/emscripten-entry.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -ex
+set -eux
 
 # shellcheck disable=SC1091
 source /emsdk-portable/emsdk_env.sh &> /dev/null

ci/emscripten.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -ex
+set -eux
 
 # Note: keep in sync with:
 # https://github.com/rust-lang/rust/blob/master/src/ci/docker/scripts/emscripten.sh

ci/install-musl.sh

@@ -3,7 +3,7 @@
 # Install musl and musl-sanitized linux kernel headers
 # to musl-{$1} directory
 
-set -ex
+set -eux
 
 musl_version=1.1.24
 musl="musl-${musl_version}"

ci/install-rust.sh

@@ -1,17 +1,14 @@
 #!/usr/bin/env sh
 # This is intended to be used in CI only.
 
-set -ex
+set -eux
 
 echo "Setup toolchain"
-toolchain=
-if [ -n "$TOOLCHAIN" ]; then
-  toolchain=$TOOLCHAIN
-else
-  toolchain=nightly
-fi
 
-if [ "$OS" = "windows" ]; then
+toolchain="${TOOLCHAIN:-nightly}"
+os="${OS:-}"
+
+if [ "$os" = "windows" ]; then
     : "${TARGET?The TARGET environment variable must be set.}"
     rustup set profile minimal
     rustup update --force "$toolchain-$TARGET"
@@ -22,18 +19,18 @@ else
     rustup default "$toolchain"
 fi
 
-if [ -n "$TARGET" ]; then
+if [ -n "${TARGET:-}" ]; then
     echo "Install target"
     rustup target add "$TARGET"
 fi
 
-if [ -n "$INSTALL_RUST_SRC" ]; then
+if [ -n "${INSTALL_RUST_SRC:-}" ]; then
     echo "Install rust-src"
     rustup component add rust-src
 fi
 
-if [ "$OS" = "windows" ]; then
-    if [ "$ARCH_BITS" = "i686" ]; then
+if [ "$os" = "windows" ]; then
+    if [ "${ARCH_BITS:-}" = "i686" ]; then
         echo "Install MinGW32"
         choco install mingw --x86 --force
     fi
@@ -44,7 +41,7 @@ if [ "$OS" = "windows" ]; then
     /usr/bin/find "C:\ProgramData\Chocolatey" -name "dllcrt2*"
     /usr/bin/find "C:\ProgramData\Chocolatey" -name "libmsvcrt*"
 
-    if [ -n "$ARCH_BITS" ]; then
+    if [ -n "${ARCH_BITS:-}" ]; then
         echo "Fix MinGW"
         for i in crt2.o dllcrt2.o libmingwex.a libmsvcrt.a ; do
             cp -f "/C/ProgramData/Chocolatey/lib/mingw/tools/install/mingw$ARCH_BITS/$ARCH-w64-mingw32/lib/$i" "$(rustc --print sysroot)/lib/rustlib/$TARGET/lib"

ci/linux-s390x.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-set -ex
+set -eux
 
 mkdir -m 777 /qemu
 cd /qemu

ci/linux-sparc64.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-set -ex
+set -eux
 
 mkdir -m 777 /qemu
 cd /qemu

ci/run-docker.sh

@@ -6,7 +6,7 @@
 # Small script to run tests for a target (or all targets) inside all the
 # respective docker images.
 
-set -ex
+set -eux
 
 # Default to assuming the CARGO_HOME is one directory up (to account for a `bin`
 # subdir) from where the `cargo` binary in `$PATH` lives.
@@ -89,13 +89,13 @@ build_switch() {
 }
 
 if [ -z "${1}" ]; then
-  for d in ci/docker/*; do
-    run "${d}"
-  done
+    for d in ci/docker/*; do
+        run "${d}"
+    done
 else
-  if [ "${1}" != "switch" ]; then
-    run "${1}"
-  else
-    build_switch
-  fi
+    if [ "${1}" != "switch" ]; then
+        run "${1}"
+    else
+        build_switch
+    fi
 fi

ci/run.sh

@@ -3,7 +3,7 @@
 # Builds and runs tests for a particular target passed as an argument to this
 # script.
 
-set -ex
+set -eux
 
 mirrors_url="https://ci-mirrors.rust-lang.org/libc"
 
@@ -15,7 +15,7 @@ target="$1"
 #
 # It's assume that all images, when run with two disks, will run the `run.sh`
 # script from the second which we place inside.
-if [ "$QEMU" != "" ]; then
+if [ -n "${QEMU:-}" ]; then
     tmpdir=/tmp/qemu-img-creation
     mkdir -p "${tmpdir}"
 

ci/style.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -ex
+set -eux
 
 rustc ci/style.rs && ./style src
 

ci/test-runner-linux

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -eux
 
 arch="$1"
 prog="$2"

ci/wasi.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -ex
+set -eux
 
 apt-get update
 apt-get install -y --no-install-recommends \