From 3d601fe32066619f50297cb52131d1bbf5e6862e Mon Sep 17 00:00:00 2001 From: iphydf Date: Wed, 6 May 2020 00:15:09 +0100 Subject: style: Run restyled on Travis and Circle CI scripts. --- .travis/autotools-linux | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to '.travis/autotools-linux') 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 -- cgit v1.2.3