From 72501a0f2f7a0fa5e6046bbb134da4d437551ca3 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Thu, 19 Oct 2017 09:48:08 +0200 Subject: [PATCH] Fix & silence shellcheck warnings --- .travis/linux..script.sh | 3 ++- cmake/linux/package_linux.sh.in | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis/linux..script.sh b/.travis/linux..script.sh index f22991337..d74160383 100755 --- a/.travis/linux..script.sh +++ b/.travis/linux..script.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash -if [ $QT5 ]; then +if [ "$QT5" ]; then unset QTDIR QT_PLUGIN_PATH LD_LIBRARY_PATH + # shellcheck disable=SC1091 source /opt/qt58/bin/qt58-env.sh fi diff --git a/cmake/linux/package_linux.sh.in b/cmake/linux/package_linux.sh.in index 275baba35..0e1494331 100644 --- a/cmake/linux/package_linux.sh.in +++ b/cmake/linux/package_linux.sh.in @@ -18,6 +18,7 @@ DESKTOPFILE="${APPDIR}usr/share/applications/lmms.desktop" STRIP="" # Don't strip for Debug|RelWithDebInfo builds +# shellcheck disable=SC2193 if [[ "@CMAKE_BUILD_TYPE@" == *"Deb"* ]]; then STRIP="-no-strip" fi @@ -51,7 +52,8 @@ fi echo -e "\nWriting verbose output to \"${LOGFILE}\"" # Ensure linuxdeployqt uses the same qmake version as cmake -export PATH="$(dirname "@QT_QMAKE_EXECUTABLE@")":$PATH +export PATH +PATH="$(dirname "@QT_QMAKE_EXECUTABLE@")":$PATH # Fetch portable linuxdeployqt if cache is older than $DAYSOLD echo -e "\nDownloading linuxdeployqt to ${LINUXDEPLOYQT}..."