Skip to content

Commit

Permalink
Remove the need for unset ... calls using AppRun file (#370)
Browse files Browse the repository at this point in the history
  • Loading branch information
probonopd authored May 1, 2019
1 parent 9bb5ff7 commit 78b7efe
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
5 changes: 5 additions & 0 deletions linuxdeployqt.AppDir/AppRun
Original file line number Diff line number Diff line change
@@ -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" "$@"
1 change: 1 addition & 0 deletions tests/tests-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 78b7efe

Please sign in to comment.