From fcdd8da9368e85f0639f778d35c275632c212090 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 30 May 2020 01:54:56 +0100 Subject: [PATCH] Fix CI shell Signed-off-by: falkTX --- .travis.yml | 8 ++--- setup/check_target.sh | 72 +++++++++++++++++++++---------------------- 2 files changed, 39 insertions(+), 41 deletions(-) diff --git a/.travis.yml b/.travis.yml index eeb31ee..b27ce26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,14 +35,14 @@ jobs: - PLUGINS="dpf-plugins" before_install: - - sh ${TRAVIS_BUILD_DIR}/.travis/before_install.sh + - bash ${TRAVIS_BUILD_DIR}/.travis/before_install.sh install: - - sh ${TRAVIS_BUILD_DIR}/.travis/install.sh + - bash ${TRAVIS_BUILD_DIR}/.travis/install.sh script: - - sh ${TRAVIS_BUILD_DIR}/bootstrap.sh ${TARGET} - - sh ${TRAVIS_BUILD_DIR}/build-plugin.sh ${TARGET} ${PLUGINS} + - bash ${TRAVIS_BUILD_DIR}/bootstrap.sh ${TARGET} + - bash ${TRAVIS_BUILD_DIR}/build-plugin.sh ${TARGET} ${PLUGINS} notifications: email: true diff --git a/setup/check_target.sh b/setup/check_target.sh index f46db49..0eece72 100644 --- a/setup/check_target.sh +++ b/setup/check_target.sh @@ -8,43 +8,41 @@ WIN32=0 WIN64=0 function check_target() { - -case ${target} in - "macos") - MACOS=1 - ;; - "macos-old") - MACOS=1 - MACOS_OLD=1 - CROSS_COMPILING=1 - ;; - "win32") - WIN32=1 - CROSS_COMPILING=1 - ;; - "win64") - WIN32=1 - WIN64=1 - CROSS_COMPILING=1 - ;; - "Linux") - LINUX=1 - ;; - "native") - target=$(uname -s) - check_target - ;; - default) - echo "Invalid target '${target}', possible values are:" - echo "\tmacos" - echo "\tmacos-old" - echo "\twin32" - echo "\twin64" - echo "\tnative" - exit 2 - ;; -esac - + case "${target}" in + "macos") + MACOS=1 + ;; + "macos-old") + MACOS=1 + MACOS_OLD=1 + CROSS_COMPILING=1 + ;; + "win32") + WIN32=1 + CROSS_COMPILING=1 + ;; + "win64") + WIN32=1 + WIN64=1 + CROSS_COMPILING=1 + ;; + "Linux") + LINUX=1 + ;; + "native") + target=$(uname -s) + check_target + ;; + default) + echo "Invalid target '${target}', possible values are:" + echo "\tmacos" + echo "\tmacos-old" + echo "\twin32" + echo "\twin64" + echo "\tnative" + exit 2 + ;; + esac } check_target