1 files changed, 24 insertions, 23 deletions

diff --git a/.travis/cmake-freebsd-stage1 b/.travis/cmake-freebsd-stage1
index 6a88ed44..29667e82 100755
--- a/.travis/cmake-freebsd-stage1
+++ b/.travis/cmake-freebsd-stage1
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Download and initial setup of the FreeBSD VM
 
@@ -9,7 +9,7 @@ set -eux
 . .travis/cmake-freebsd-env.sh
 
 travis_install() {
-  git tag -l --sort=version:refname > GIT_TAGS
+  git tag -l --sort=version:refname >GIT_TAGS
 
   OLD_PWD="$PWD"
 
@@ -19,9 +19,9 @@ travis_install() {
   # === Get the VM image, set it up and cache ===
 
   # Create image if it's not cached, or if this build script has changed, or a new toxcore tag was pushed
-  sha256sum "$OLD_PWD/.travis/cmake-freebsd-env.sh"         > /tmp/sha
-  sha256sum "$OLD_PWD/.travis/cmake-freebsd-stage1"        >> /tmp/sha
-  sha256sum "$OLD_PWD/.travis/cmake-freebsd-stage1.expect" >> /tmp/sha
+  sha256sum "$OLD_PWD/.travis/cmake-freebsd-env.sh" >/tmp/sha
+  sha256sum "$OLD_PWD/.travis/cmake-freebsd-stage1" >>/tmp/sha
+  sha256sum "$OLD_PWD/.travis/cmake-freebsd-stage1.expect" >>/tmp/sha
   if [ ! -f "./$IMAGE_NAME.tgz" ] || [ ! -f ./cmake-freebsd-stage1-all.sha256 ] || [ "$(cat cmake-freebsd-stage1-all.sha256)" != "$(cat /tmp/sha)" ] || ! diff -u ./GIT_TAGS "$OLD_PWD/GIT_TAGS"; then
     rm -rf ./*
 
@@ -42,8 +42,8 @@ travis_install() {
       DL_MIRROR_11=14
 
       # There are 11 mirrors
-      DL_MIRROR_RANDOM=`expr $(date +%s) % 11 + 1`
-      DL_URL="ftp://ftp$(eval echo \$DL_MIRROR_$DL_MIRROR_RANDOM).us.freebsd.org/pub/FreeBSD/releases/VM-IMAGES/${FREEBSD_VERSION}-RELEASE/amd64/Latest/${IMAGE_NAME}.xz"
+      DL_MIRROR_RANDOM=$(expr "$(date +%s)" % 11 + 1)
+      DL_URL="ftp://ftp$(eval echo \$DL_MIRROR_"$DL_MIRROR_RANDOM").us.freebsd.org/pub/FreeBSD/releases/VM-IMAGES/$FREEBSD_VERSION-RELEASE/amd64/Latest/$IMAGE_NAME.xz"
 
       # Make sure there are no partial downloads from the previous loop iterations
       rm -rf ./*
@@ -51,7 +51,7 @@ travis_install() {
       wget --tries 1 "$DL_URL" && break
     done
 
-    if ! ( echo "$IMAGE_SHA512  $IMAGE_NAME.xz" | sha512sum -c --status - ) ; then
+    if ! (echo "$IMAGE_SHA512  $IMAGE_NAME.xz" | sha512sum -c --status -); then
       echo "Error: sha512 of $IMAGE_NAME.xz doesn't match the known one"
       exit 1
     fi
@@ -81,18 +81,19 @@ travis_install() {
     RUN chsh -s /usr/local/bin/bash root
 
     # Install required toxcore dependencies
-    RUN PAGER=cat ASSUME_ALWAYS_YES=YES pkg install git \
-                                                    opus \
-                                                    libconfig \
-                                                    libvpx \
-                                                    libsodium \
-                                                    gmake \
-                                                    cmake \
-                                                    pkgconf \
-                                                    portaudio \
-                                                    libsndfile \
-                                                    texinfo \
-                                                    autotools
+    RUN PAGER=cat ASSUME_ALWAYS_YES=YES pkg install \
+      git \
+      opus \
+      libconfig \
+      libvpx \
+      libsodium \
+      gmake \
+      cmake \
+      pkgconf \
+      portaudio \
+      libsndfile \
+      texinfo \
+      autotools
 
     # === Cache the VM image ===
 
@@ -103,9 +104,9 @@ travis_install() {
     rm "$IMAGE_NAME"
 
     cp "$OLD_PWD/GIT_TAGS" .
-    sha256sum "$OLD_PWD/.travis/cmake-freebsd-env.sh"         > cmake-freebsd-stage1-all.sha256
-    sha256sum "$OLD_PWD/.travis/cmake-freebsd-stage1"        >> cmake-freebsd-stage1-all.sha256
-    sha256sum "$OLD_PWD/.travis/cmake-freebsd-stage1.expect" >> cmake-freebsd-stage1-all.sha256
+    sha256sum "$OLD_PWD/.travis/cmake-freebsd-env.sh" >cmake-freebsd-stage1-all.sha256
+    sha256sum "$OLD_PWD/.travis/cmake-freebsd-stage1" >>cmake-freebsd-stage1-all.sha256
+    sha256sum "$OLD_PWD/.travis/cmake-freebsd-stage1.expect" >>cmake-freebsd-stage1-all.sha256
     ls -lh
   fi