From 78b7efea255ca517888e89fee63d64752a1f70fb Mon Sep 17 00:00:00 2001 From: probonopd Date: Wed, 1 May 2019 07:54:28 +0000 Subject: [PATCH] Remove the need for unset ... calls using AppRun file (#370) --- linuxdeployqt.AppDir/AppRun | 5 +++++ tests/tests-ci.sh | 1 + 2 files changed, 6 insertions(+) create mode 100644 linuxdeployqt.AppDir/AppRun diff --git a/linuxdeployqt.AppDir/AppRun b/linuxdeployqt.AppDir/AppRun new file mode 100644 index 0000000..a87edb1 --- /dev/null +++ b/linuxdeployqt.AppDir/AppRun @@ -0,0 +1,5 @@ +#!/bin/bash +# This file is being used so that users don't have to unset env vars manually +HERE="$(dirname "$(readlink -f "${0}")")" +unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH +exec "${HERE}/usr/bin/linuxdeployqt" "$@" diff --git a/tests/tests-ci.sh b/tests/tests-ci.sh index 60a6a6e..5d6595c 100755 --- a/tests/tests-ci.sh +++ b/tests/tests-ci.sh @@ -13,6 +13,7 @@ mkdir -p linuxdeployqt.AppDir/usr/{bin,lib} cp /usr/bin/{patchelf,desktop-file-validate} /usr/local/bin/{appimagetool,zsyncmake} linuxdeployqt.AppDir/usr/bin/ cp ./bin/linuxdeployqt linuxdeployqt.AppDir/usr/bin/ cp -r /usr/local/lib/appimagekit linuxdeployqt.AppDir/usr/lib/ +chmod +x linuxdeployqt.AppDir/AppRun find linuxdeployqt.AppDir/ export VERSION=continuous if [ ! -z $TRAVIS_TAG ] ; then export VERSION=$TRAVIS_TAG ; fi