ci: cleanup

This cleans up our CI scripts but doesn't significantly change anything.
Mostly this is removing dead code and wrong comments, and making the style
a bit more consistent.

ci/install.sh

@@ -1,29 +1,22 @@
-# `install` phase: install stuff needed for the `script` phase
+#!/bin/bash
+
+# install stuff needed for the `script` phase
+
+# Where rustup gets installed.
+export PATH="$PATH:$HOME/.cargo/bin"
 
 set -ex
 
-. $(dirname $0)/utils.sh
-
-install_c_toolchain() {
-    case $TARGET in
-        aarch64-unknown-linux-gnu)
-            sudo apt-get install -y --no-install-recommends \
-                 gcc-aarch64-linux-gnu libc6-arm64-cross libc6-dev-arm64-cross
-            ;;
-        *)
-            # For other targets, this is handled by addons.apt.packages in .travis.yml
-            ;;
-    esac
-}
+. "$(dirname $0)/utils.sh"
 
 install_rustup() {
-    curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain=$TRAVIS_RUST_VERSION
-
+    curl https://sh.rustup.rs -sSf \
+      | sh -s -- -y --default-toolchain="$TRAVIS_RUST_VERSION"
     rustc -V
     cargo -V
 }
 
-install_standard_crates() {
+install_targets() {
     if [ $(host) != "$TARGET" ]; then
         rustup target add $TARGET
     fi
@@ -33,11 +26,13 @@ configure_cargo() {
     local prefix=$(gcc_prefix)
     if [ -n "${prefix}" ]; then
         local gcc_suffix=
-        test -n "${GCC_VERSION}" && gcc_suffix="-${GCC_VERSION}" || :
+        if [ -n "$GCC_VERSION" ]; then
+          gcc_suffix="-$GCC_VERSION"
+        fi
         local gcc="${prefix}gcc${gcc_suffix}"
 
         # information about the cross compiler
-        ${gcc} -v
+        "${gcc}" -v
 
         # tell cargo which linker to use for cross compilation
         mkdir -p .cargo
@@ -49,12 +44,9 @@ EOF
 }
 
 main() {
-    install_c_toolchain
     install_rustup
-    install_standard_crates
+    install_targets
     configure_cargo
-
-    # TODO if you need to install extra stuff add it here
 }
 
 main