Clean up scripts with shellcheck

src/ci/docker/host-x86_64/disabled/dist-x86_64-dragonfly/build-toolchain.sh

@@ -14,10 +14,10 @@ echo ERROR: An error was encountered with the build.
 cat /tmp/build.log
 exit 1
 "
-  trap "$on_err" ERR
+  trap '$on_err' ERR
   bash -c "while true; do sleep 30; echo \$(date) - building ...; done" &
   PING_LOOP_PID=$!
-  $@ &> /tmp/build.log
+  "$@" &> /tmp/build.log
   trap - ERR
   kill $PING_LOOP_PID
   set -x
@@ -85,7 +85,7 @@ cd gcc-$GCC
 # These patches probably only need to be updated in case the gcc version is
 # updated.
 
-patch -p0 < $PATCH_TOOLCHAIN
+patch -p0 < "$PATCH_TOOLCHAIN"
 
 ./contrib/download_prerequisites
 

src/ci/docker/host-x86_64/disabled/dist-x86_64-haiku/build-toolchain.sh

@@ -19,10 +19,10 @@ echo ERROR: An error was encountered with the build.
 cat /tmp/build.log
 exit 1
 "
-  trap "$on_err" ERR
+  trap '$on_err' ERR
   bash -c "while true; do sleep 30; echo \$(date) - building ...; done" &
   PING_LOOP_PID=$!
-  $@ &> /tmp/build.log
+  "$@" &> /tmp/build.log
   trap - ERR
   kill $PING_LOOP_PID
   set -x
@@ -31,35 +31,35 @@ exit 1
 # First up, build a cross-compiler
 git clone --depth=1 https://git.haiku-os.org/haiku
 git clone --depth=1 https://git.haiku-os.org/buildtools
-cd $BUILDTOOLS/jam
+cd "$BUILDTOOLS/jam"
 hide_output make
 hide_output ./jam0 install
-mkdir -p $OUTPUT
-cd $OUTPUT
-hide_output $HAIKU/configure --build-cross-tools $ARCH $TOP/buildtools
+mkdir -p "$OUTPUT"
+cd "$OUTPUT"
+hide_output "$HAIKU/configure" --build-cross-tools "$ARCH" "$TOP/buildtools"
 
 # Set up sysroot to redirect to /system
-mkdir -p $SYSROOT/boot
-mkdir -p $PACKAGE_ROOT
-ln -s $PACKAGE_ROOT $SYSROOT/boot/system
+mkdir -p "$SYSROOT/boot"
+mkdir -p "$PACKAGE_ROOT"
+ln -s "$PACKAGE_ROOT" "$SYSROOT/boot/system"
 
 # Build needed packages and tools for the cross-compiler
 hide_output jam -q haiku.hpkg haiku_devel.hpkg '<build>package'
 
 # Set up our sysroot
 cp $OUTPUT/objects/linux/lib/*.so /lib/x86_64-linux-gnu
 cp $OUTPUT/objects/linux/x86_64/release/tools/package/package /bin/
-find $SYSROOT/../bin/ -type f -exec ln -s {} /bin/ \;
+find "$SYSROOT/../bin/" -type f -exec ln -s {} /bin/ \;
 
 # Extract packages
-package extract -C $PACKAGE_ROOT $OUTPUT/objects/haiku/$ARCH/packaging/packages/haiku.hpkg
-package extract -C $PACKAGE_ROOT $OUTPUT/objects/haiku/$ARCH/packaging/packages/haiku_devel.hpkg
+package extract -C $PACKAGE_ROOT $OUTPUT/objects/haiku/"$ARCH"/packaging/packages/haiku.hpkg
+package extract -C $PACKAGE_ROOT $OUTPUT/objects/haiku/"$ARCH"/packaging/packages/haiku_devel.hpkg
 find $OUTPUT/download/ -name '*.hpkg' -exec package extract -C $PACKAGE_ROOT {} \;
 
 # Fix libgcc_s so we can link to it
 cd $PACKAGE_ROOT/develop/lib
 ln -s ../../lib/libgcc_s.so libgcc_s.so
 
 # Clean up
-rm -rf $BUILDTOOLS $HAIKU $OUTPUT/Jamfile $OUTPUT/attributes $OUTPUT/build \
-  $OUTPUT/build_packages $OUTPUT/download $OUTPUT/objects
+rm -rf "$BUILDTOOLS" "$HAIKU" "$OUTPUT"/Jamfile "$OUTPUT"/attributes "$OUTPUT"/build \
+  "$OUTPUT"/build_packages "$OUTPUT"/download "$OUTPUT"/objects

src/ci/docker/host-x86_64/disabled/dist-x86_64-haiku/fetch-packages.sh

@@ -6,4 +6,4 @@ wget http://packages.haiku-os.org/haikuports/master/hpkg/llvm_libs-4.0.1-2-x86_6
 package extract -C /system llvm-4.0.1-2-x86_64.hpkg
 package extract -C /system llvm_libs-4.0.1-2-x86_64.hpkg
 
-rm -f *.hpkg
+rm -f -- *.hpkg

src/ci/docker/host-x86_64/disabled/dist-x86_64-haiku/llvm-config.sh

@@ -2,29 +2,29 @@
 
 case $1 in
 --version) echo  4.0.1;;
---prefix) echo  $SCRATCH/haiku-cross/sysroot/boot/system;;
---bindir) echo  $SCRATCH/haiku-cross/sysroot/boot/system/bin;;
---includedir) echo  $SCRATCH/haiku-cross/sysroot/boot/system/develop/headers;;
---libdir) echo  $SCRATCH/haiku-/cross/sysroot/boot/system/develop/lib;;
---cmakedir) echo  $SCRATCH/haiku-/cross/sysroot/boot/system/develop/lib/cmake/llvm;;
---cppflags) echo  -I$SCRATCH/haiku-/cross/sysroot/boot/system/develop/headers \
+--prefix) echo  "$SCRATCH"/haiku-cross/sysroot/boot/system;;
+--bindir) echo  "$SCRATCH"/haiku-cross/sysroot/boot/system/bin;;
+--includedir) echo  "$SCRATCH"/haiku-cross/sysroot/boot/system/develop/headers;;
+--libdir) echo  "$SCRATCH"/haiku-/cross/sysroot/boot/system/develop/lib;;
+--cmakedir) echo  "$SCRATCH"/haiku-/cross/sysroot/boot/system/develop/lib/cmake/llvm;;
+--cppflags) echo  -I"$SCRATCH"/haiku-/cross/sysroot/boot/system/develop/headers \
                   -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS;;
---cflags) echo  -I$SCRATCH/haiku-cross/sysroot/boot/system/develop/headers \
+--cflags) echo  -I"$SCRATCH"/haiku-cross/sysroot/boot/system/develop/headers \
                 -fPIC -Wall -W -Wno-unused-parameter -Wwrite-strings \
                 -Wno-missing-field-initializers -pedantic -Wno-long-long -Wno-comment \
                 -Werror=date-time -ffunction-sections -fdata-sections -O3 -DNDEBUG \
                 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS;;
---cxxflags) echo  -I/$SCRATCH/haiku-cross/sysroot/boot/system/develop/headers \
+--cxxflags) echo  -I/"$SCRATCH"/haiku-cross/sysroot/boot/system/develop/headers \
                   -fPIC -fvisibility-inlines-hidden -Wall -W -Wno-unused-parameter \
                   -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -pedantic \
                   -Wno-long-long -Wno-maybe-uninitialized -Wdelete-non-virtual-dtor \
                   -Wno-comment -Werror=date-time -std=c++11 -ffunction-sections \
                   -fdata-sections -O3 -DNDEBUG  -fno-exceptions \
                   -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS;;
---ldflags) echo  -L$SCRATCH/haiku-cross/sysroot/boot/system/develop/lib ;;
+--ldflags) echo  -L"$SCRATCH"/haiku-cross/sysroot/boot/system/develop/lib ;;
 --system-libs) echo ;;
 --libs) echo  -lLLVM-4.0;;
---libfiles) echo  $SCRATCH/haiku-cross/sysroot/boot/system/develop/lib/libLLVM-4.0.so;;
+--libfiles) echo  "$SCRATCH"/haiku-cross/sysroot/boot/system/develop/lib/libLLVM-4.0.so;;
 --components) echo  aarch64 aarch64asmparser aarch64asmprinter aarch64codegen \
                     aarch64desc aarch64disassembler aarch64info aarch64utils all \
                     all-targets amdgpu amdgpuasmparser amdgpuasmprinter amdgpucodegen \

src/ci/docker/host-x86_64/dist-aarch64-linux/build-toolchains.sh

@@ -8,10 +8,10 @@ echo ERROR: An error was encountered with the build.
 cat /tmp/build.log
 exit 1
 "
-  trap "$on_err" ERR
+  trap '$on_err' ERR
   bash -c "while true; do sleep 30; echo \$(date) - building ...; done" &
   PING_LOOP_PID=$!
-  $@ &> /tmp/build.log
+  "$@" &> /tmp/build.log
   rm /tmp/build.log
   trap - ERR
   kill $PING_LOOP_PID

src/ci/docker/host-x86_64/dist-arm-linux/build-toolchains.sh

@@ -9,10 +9,10 @@ echo ERROR: An error was encountered with the build.
 cat /tmp/build.log
 exit 1
 "
-  trap "$on_err" ERR
+  trap '$on_err' ERR
   bash -c "while true; do sleep 30; echo \$(date) - building ...; done" &
   PING_LOOP_PID=$!
-  $@ &> /tmp/build.log
+  "$@" &> /tmp/build.log
   rm /tmp/build.log
   trap - ERR
   kill $PING_LOOP_PID

src/ci/docker/host-x86_64/dist-armhf-linux/build-toolchains.sh

@@ -9,10 +9,10 @@ echo ERROR: An error was encountered with the build.
 cat /tmp/build.log
 exit 1
 "
-  trap "$on_err" ERR
+  trap '$on_err' ERR
   bash -c "while true; do sleep 30; echo \$(date) - building ...; done" &
   PING_LOOP_PID=$!
-  $@ &> /tmp/build.log
+  "$@" &> /tmp/build.log
   rm /tmp/build.log
   trap - ERR
   kill $PING_LOOP_PID

src/ci/docker/host-x86_64/dist-armv7-linux/build-toolchains.sh

@@ -9,10 +9,10 @@ echo ERROR: An error was encountered with the build.
 cat /tmp/build.log
 exit 1
 "
-  trap "$on_err" ERR
+  trap '$on_err' ERR
   bash -c "while true; do sleep 30; echo \$(date) - building ...; done" &
   PING_LOOP_PID=$!
-  $@ &> /tmp/build.log
+  "$@" &> /tmp/build.log
   rm /tmp/build.log
   trap - ERR
   kill $PING_LOOP_PID

src/ci/docker/host-x86_64/dist-powerpc-linux/build-powerpc-toolchain.sh

@@ -8,10 +8,10 @@ echo ERROR: An error was encountered with the build.
 cat /tmp/build.log
 exit 1
 "
-  trap "$on_err" ERR
+  trap '$on_err' ERR
   bash -c "while true; do sleep 30; echo \$(date) - building ...; done" &
   PING_LOOP_PID=$!
-  $@ &> /tmp/build.log
+  "$@" &> /tmp/build.log
   rm /tmp/build.log
   trap - ERR
   kill $PING_LOOP_PID

src/ci/docker/host-x86_64/dist-powerpc64-linux/shared.sh

@@ -1,14 +1,15 @@
+#!/usr/bin/env bash
 hide_output() {
   set +x
   on_err="
 echo ERROR: An error was encountered with the build.
 cat /tmp/build.log
 exit 1
 "
-  trap "$on_err" ERR
+  trap '$on_err' ERR
   bash -c "while true; do sleep 30; echo \$(date) - building ...; done" &
   PING_LOOP_PID=$!
-  $@ &> /tmp/build.log
+  "$@" &> /tmp/build.log
   trap - ERR
   kill $PING_LOOP_PID
   set -x

src/ci/docker/host-x86_64/dist-powerpc64le-linux/shared.sh

@@ -1,14 +1,15 @@
+#!/usr/bin/env bash
 hide_output() {
   set +x
   on_err="
 echo ERROR: An error was encountered with the build.
 cat /tmp/build.log
 exit 1
 "
-  trap "$on_err" ERR
+  trap '$on_err' ERR
   bash -c "while true; do sleep 30; echo \$(date) - building ...; done" &
   PING_LOOP_PID=$!
-  $@ &> /tmp/build.log
+  "$@" &> /tmp/build.log
   trap - ERR
   kill $PING_LOOP_PID
   set -x

src/ci/docker/host-x86_64/dist-riscv64-linux/build-toolchains.sh

@@ -9,10 +9,10 @@ echo ERROR: An error was encountered with the build.
 cat /tmp/build.log
 exit 1
 "
-  trap "$on_err" ERR
+  trap '$on_err' ERR
   bash -c "while true; do sleep 30; echo \$(date) - building ...; done" &
   PING_LOOP_PID=$!
-  $@ &> /tmp/build.log
+  "$@" &> /tmp/build.log
   rm /tmp/build.log
   trap - ERR
   kill $PING_LOOP_PID

src/ci/docker/host-x86_64/dist-riscv64-linux/crosstool-ng.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 set -ex
 
 # Mirrored from https://github.com/crosstool-ng/crosstool-ng/archive/crosstool-ng-1.24.0.tar.gz

src/ci/docker/host-x86_64/dist-s390x-linux/build-s390x-toolchain.sh

@@ -8,10 +8,10 @@ echo ERROR: An error was encountered with the build.
 cat /tmp/build.log
 exit 1
 "
-  trap "$on_err" ERR
+  trap '$on_err' ERR
   bash -c "while true; do sleep 30; echo \$(date) - building ...; done" &
   PING_LOOP_PID=$!
-  $@ &> /tmp/build.log
+  "$@" &> /tmp/build.log
   rm /tmp/build.log
   trap - ERR
   kill $PING_LOOP_PID

src/ci/docker/host-x86_64/dist-various-1/build-rumprun.sh

@@ -8,10 +8,10 @@ echo ERROR: An error was encountered with the build.
 cat /tmp/build.log
 exit 1
 "
-  trap "$on_err" ERR
+  trap '$on_err' ERR
   bash -c "while true; do sleep 30; echo \$(date) - building ...; done" &
   PING_LOOP_PID=$!
-  $@ &> /tmp/build.log
+  "$@" &> /tmp/build.log
   trap - ERR
   kill $PING_LOOP_PID
   rm /tmp/build.log

src/ci/docker/host-x86_64/dist-various-1/install-mips-musl.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 set -ex
 
 mkdir /usr/local/mips-linux-musl
@@ -10,5 +11,5 @@ FILE="OpenWrt-Toolchain-ar71xx-generic_gcc-5.3.0_musl-1.1.16.Linux-x86_64.tar.bz
 curl -L "$URL/$FILE" | tar xjf - -C /usr/local/mips-linux-musl --strip-components=2
 
 for file in /usr/local/mips-linux-musl/bin/mips-openwrt-linux-*; do
-  ln -s $file /usr/local/bin/`basename $file`
+  ln -s "$file" /usr/local/bin/"$(basename "$file")"
 done

src/ci/docker/host-x86_64/dist-various-1/install-mipsel-musl.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 set -ex
 
 mkdir /usr/local/mipsel-linux-musl
@@ -10,5 +11,5 @@ FILE="OpenWrt-Toolchain-malta-le_gcc-5.3.0_musl-1.1.15.Linux-x86_64.tar.bz2"
 curl -L "$URL/$FILE" | tar xjf - -C /usr/local/mipsel-linux-musl --strip-components=2
 
 for file in /usr/local/mipsel-linux-musl/bin/mipsel-openwrt-linux-*; do
-  ln -s $file /usr/local/bin/`basename $file`
+  ln -s "$file" /usr/local/bin/"$(basename "$file")"
 done

src/ci/docker/host-x86_64/dist-various-2/build-cloudabi-toolchain.sh

@@ -25,12 +25,12 @@ apt-get install -y --no-install-recommends \
 # Based on the steps described at https://nuxi.nl/cloudabi/debian/
 target=$1
 for tool in ar nm objdump ranlib size; do
-  ln -s ../lib/llvm-5.0/bin/llvm-${tool} /usr/bin/${target}-${tool}
+  ln -s ../lib/llvm-5.0/bin/llvm-"${tool}" /usr/bin/"${target}-${tool}"
 done
-ln -s ../lib/llvm-5.0/bin/clang /usr/bin/${target}-cc
-ln -s ../lib/llvm-5.0/bin/clang /usr/bin/${target}-c++
-ln -s ../lib/llvm-5.0/bin/lld /usr/bin/${target}-ld
-ln -s ../../${target} /usr/lib/llvm-5.0/${target}
+ln -s ../lib/llvm-5.0/bin/clang /usr/bin/"${target}"-cc
+ln -s ../lib/llvm-5.0/bin/clang /usr/bin/"${target}"-c++
+ln -s ../lib/llvm-5.0/bin/lld /usr/bin/"${target}"-ld
+ln -s ../../"${target}" /usr/lib/llvm-5.0/"${target}"
 
 # Install the C++ runtime libraries from CloudABI Ports.
 apt-key adv --batch --yes --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0DA51B8531344B15

src/ci/docker/host-x86_64/dist-various-2/build-fuchsia-toolchain.sh

@@ -27,11 +27,11 @@ build() {
     aarch64) tgt="zircon-qemu-arm64" ;;
   esac
 
-  hide_output make -j$(getconf _NPROCESSORS_ONLN) $tgt
-  dst=/usr/local/${arch}-fuchsia
-  mkdir -p $dst
-  cp -a build-${tgt}/sysroot/include $dst/
-  cp -a build-${tgt}/sysroot/lib $dst/
+  hide_output make "-j$(getconf _NPROCESSORS_ONLN)" $tgt
+  dst="/usr/local/${arch}-fuchsia"
+  mkdir -p "$dst"
+  cp -a "build-${tgt}/sysroot/include" "$dst/"
+  cp -a "build-${tgt}/sysroot/lib" "$dst/"
 }
 
 # Build sysroot