1 files changed, 12 insertions, 10 deletions

diff --git a/.travis/autotools-linux b/.travis/autotools-linux
index 96c110ab..ffadcad8 100755
--- a/.travis/autotools-linux
+++ b/.travis/autotools-linux
@@ -1,22 +1,24 @@
-#!/bin/sh
+#!/bin/bash
 
 ACTION="$1"
 
 set -eu
 
 CACHEDIR="$HOME/cache"
-NPROC=`nproc`
+NPROC=$(nproc)
 
 travis_install() {
   # Install vanilla NaCl only.
   [ -f "$CACHEDIR/lib/amd64/libnacl.a" ] || {
     curl https://hyperelliptic.org/nacl/nacl-20110221.tar.bz2 | tar jx
-    cd nacl-20110221  # pushd
+    cd nacl-20110221 # pushd
     "./do"
     # "make install"
-    mkdir -p "$CACHEDIR/include"; mv build/*/include/* "$CACHEDIR/include"
-    mkdir -p "$CACHEDIR/lib"    ; mv build/*/lib/* "$CACHEDIR/lib"
-    cd -  # popd
+    mkdir -p "$CACHEDIR/include"
+    mv build/*/include/* "$CACHEDIR/include"
+    mkdir -p "$CACHEDIR/lib"
+    mv build/*/lib/* "$CACHEDIR/lib"
+    cd - # popd
   }
 }
 
@@ -38,11 +40,11 @@ travis_script() {
 
   autoreconf -fi
   mkdir -p _build
-  cd _build  # pushd
-  ../configure $CONFIG_FLAGS || (cat config.log && false)
+  cd _build # pushd
+  ../configure "${CONFIG_FLAGS[@]}" || (cat config.log && false)
   make "-j$NPROC" -k CFLAGS="$C_FLAGS" LDFLAGS="$LD_FLAGS"
-  make -j50 -k distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIG_FLAGS" || (cat tox-*/_build/build/test-suite.log && false)
-  cd -  # popd
+  make -j50 -k distcheck DISTCHECK_CONFIGURE_FLAGS="${CONFIG_FLAGS[*]}" || (cat tox-*/_build/build/test-suite.log && false)
+  cd - # popd
 }
 
 if [ "-z" "$ACTION" ]; then