Make the cross scripts compatible with Cirrus

Author: asomers

ci/install.sh

@@ -1,14 +1,20 @@
-#!/bin/bash
+#!/bin/sh
 set -ex
 
 main() {
     local target=
-    if [ $TRAVIS_OS_NAME = linux ]; then
+    if [ `uname` = "Linux" ]; then
         target=x86_64-unknown-linux-musl
-        sort=sort
+    else if [ `uname` = "FreeBSD" ]; then
+        target=x86_64-unknown-freebsd
     else
         target=x86_64-apple-darwin
+    fi
+
+    if which -s gsort; then
         sort=gsort  # for `sort --sort-version`, from brew's coreutils.
+    else
+        sort=sort
     fi
 
     # Builds for iOS are done on OSX, but require the specific target to be

ci/script.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # This script takes care of testing your crate
 
 set -ex
@@ -8,24 +8,27 @@ main() {
     if [ "$TRAVIS" = true ]; then
         export RUSTFLAGS=--cfg=travis
     fi
+    if [ "$CIRRUS_CI" = true ]; then
+        export RUSTFLAGS=--cfg=cirrus
+    fi
 
     IFS=';' read -ra TARGET_ARRAY <<< "$TARGET"
     for t in "${TARGET_ARRAY[@]}"; do
-	# Build debug and release targets
-	cross build --target $t
-	cross build --target $t --release
+    # Build debug and release targets
+    cross build --target $t
+    cross build --target $t --release
 
-	if [ ! -z $DISABLE_TESTS ]; then
-	    continue
-	fi
+    if [ ! -z $DISABLE_TESTS ]; then
+        continue
+    fi
 
-	# Run tests on debug and release targets.
-	cross test --target $t
-	cross test --target $t --release
+    # Run tests on debug and release targets.
+    cross test --target $t
+    cross test --target $t --release
     done
 }
 
 # we don't run the "test phase" when doing deploys
-if [ -z $TRAVIS_TAG ]; then
+if [ -z "$TRAVIS_TAG" -a -z "$CIRRUS_TAG" ]; then
     main
 fi