travis: cleanup build script

[fio.git] / ci / travis-install.sh

diff --git a/ci/travis-install.sh b/ci/travis-install.sh
index c7b6669e30a853f87819ff5ba2fb0d64fd13cc3e..103695dc6d6391f132d90681a6be4e8009b76f87 100755 (executable)
--- a/ci/travis-install.sh
+++ b/ci/travis-install.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -eu
 
 CI_TARGET_ARCH="${BUILD_ARCH:-$TRAVIS_CPU_ARCH}"
 case "$TRAVIS_OS_NAME" in
@@ -20,7 +20,10 @@ case "$TRAVIS_OS_NAME" in
        case "$CI_TARGET_ARCH" in
            "x86")
                pkgs=("${pkgs[@]/%/:i386}")
-               pkgs+=(gcc-multilib)
+               pkgs+=(
+                   gcc-multilib
+                   pkg-config:i386
+               )
                ;;
            "amd64")
                pkgs+=(nvidia-cuda-dev)
@@ -48,6 +51,5 @@ case "$TRAVIS_OS_NAME" in
        ;;
 esac
 
-echo "Python version: $(/usr/bin/python -V 2>&1)"
-echo "Python3 path: $(which python3 2>&1)"
+echo "Python3 path: $(type -p python3 2>&1)"
 echo "Python3 version: $(python3 -V 2>&1)"