Refactor ci scripts

.travis.yml

@@ -27,16 +27,16 @@ before_install:
   - rustup self update
 
 install:
-  - sh ci/install.sh
+  - ./ci/install.sh
   - source ~/.cargo/env || true
 
 script:
-  - bash ci/script.sh
+  - ./ci/script.sh
 
 after_script: set +e
 
 before_deploy:
-  - sh ci/before_deploy.sh
+  - ./ci/before_deploy.sh
 
 deploy:
   api_key:

ci/before_deploy.sh

@@ -1,21 +1,23 @@
+#!/bin/sh
+
 # This script takes care of building your crate and packaging it for release
 
 set -ex
 
 main() {
     test -f Cargo.lock || cargo generate-lockfile
 
-    cross rustc --bin $CRATE_NAME --target $TARGET --release -- -C lto
+    cross rustc --bin "$CRATE_NAME" --target "$TARGET" --release -- -C lto
 
     case $TARGET in
         x86_64-apple-darwin)
-            cp target/$TARGET/release/$CRATE_NAME $CRATE_NAME-macos
+            cp "target/$TARGET/release/$CRATE_NAME" "$CRATE_NAME-macos"
         ;;
         x86_64-unknown-linux-gnu)
-            cp target/$TARGET/release/$CRATE_NAME $CRATE_NAME-linux
+            cp "target/$TARGET/release/$CRATE_NAME" "$CRATE_NAME-linux"
         ;;
         x86_64-pc-windows-gnu)
-            cp target/$TARGET/release/$CRATE_NAME.exe $CRATE_NAME-windows.exe
+            cp "target/$TARGET/release/$CRATE_NAME.exe" "$CRATE_NAME-windows.exe"
         ;;
         *)
             echo "error: Unknown target $TARGET"

ci/install.sh

@@ -1,12 +1,11 @@
+#!/bin/sh
+
 set -ex
 
 main() {
-    local target=
-    if [ $TRAVIS_OS_NAME = linux ]; then
-        target=x86_64-unknown-linux-musl
-        sort=sort
+    if [ "$TRAVIS_OS_NAME" = linux ]; then
+        sort="sort"
     else
-        target=x86_64-apple-darwin
         sort=gsort  # for `sort --sort-version`, from brew's coreutils.
     fi
 
@@ -31,7 +30,7 @@ main() {
     esac
 
     # This fetches latest stable release
-    local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \
+    tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \
                        | cut -d/ -f3 \
                        | grep -E '^v[0.1.0-9.]+$' \
                        | $sort --version-sort \
@@ -40,8 +39,8 @@ main() {
         sh -s -- \
            --force \
            --git japaric/cross \
-           --tag $tag \
-           --target $target
+           --tag "$tag" \
+           --target "$TARGET"
 }
 
 main

ci/script.sh

@@ -1,20 +1,22 @@
+#!/bin/sh
+
 # This script takes care of testing your crate
 
 set -ex
 
 main() {
-    cross build --target $TARGET
-    cross build --target $TARGET --release
+    cross build --target "$TARGET"
+    cross build --target "$TARGET" --release
 
-    if [ ! -z $DISABLE_TESTS ]; then
+    if [ -n "$DISABLE_TESTS" ]; then
         return
     fi
 
-    cross test --target $TARGET
-    cross test --target $TARGET --release
+    cross test --target "$TARGET"
+    cross test --target "$TARGET" --release
 }
 
 # we don't run the "test phase" when doing deploys
-if [ -z $TRAVIS_TAG ]; then
+if [ -z "$TRAVIS_TAG" ]; then
     main
 fi