Simplify CI scripts

Author: Disasm

.travis.yml

@@ -22,11 +22,11 @@ matrix:
 
 
 install:
-  - bash ci/install.sh
+  - ci/install.sh
   - export PATH="$PATH:$PWD/gcc/bin"
 
 script:
-  - bash ci/script.sh
+  - ci/script.sh
 
 
 cache: cargo

ci/install.sh

@@ -1,12 +1,8 @@
-set -euxo pipefail
+#!/usr/bin/env bash
 
-main() {
-    if [ $TARGET != x86_64-unknown-linux-gnu ]; then
-        rustup target add $TARGET
-    fi
+set -euxo pipefail
 
-    mkdir gcc
-    curl -L https://static.dev.sifive.com/dev-tools/riscv64-unknown-elf-gcc-8.1.0-2018.12.0-x86_64-linux-ubuntu14.tar.gz | tar --strip-components=1 -C gcc -xz
-}
+rustup target add $TARGET
 
-main
+mkdir gcc
+curl -L https://static.dev.sifive.com/dev-tools/riscv64-unknown-elf-gcc-8.1.0-2018.12.0-x86_64-linux-ubuntu14.tar.gz | tar --strip-components=1 -C gcc -xz

ci/script.sh

@@ -1,15 +1,13 @@
-set -euxo pipefail
+#!/usr/bin/env bash
 
-main() {
-    cargo check --target $TARGET
+set -euxo pipefail
 
-    if [ $TRAVIS_RUST_VERSION = nightly ]; then
-        cargo check --target $TARGET --features inline-asm
-    fi
+cargo check --target $TARGET
 
-    if [ $TARGET = x86_64-unknown-linux-gnu ]; then
-        ./check-blobs.sh
-    fi
-}
+if [ $TRAVIS_RUST_VERSION = nightly ]; then
+    cargo check --target $TARGET --features inline-asm
+fi
 
-main
+if [ $TARGET = x86_64-unknown-linux-gnu ]; then
+    ./check-blobs.sh
+fi