diff options
| author | Janek Bevendorff <janek@jbev.net> | 2017-10-21 23:23:27 +0300 |
|---|---|---|
| committer | Janek Bevendorff <janek@jbev.net> | 2017-10-21 23:23:27 +0300 |
| commit | b510243dd86c0218c891e9ac017b16fd2dfcbef3 (patch) | |
| tree | 2960a023e1711a7d684ca476a7779f2e377d643e /AppImage-Recipe.sh | |
| parent | fe77360874b507acc6e6def8cf80c1a46ffccb1b (diff) | |
| parent | e2c6f5010830855ff1a4b49bfe60f455951218fd (diff) | |
Merge branch 'release/2.2.2' into develop
Diffstat (limited to 'AppImage-Recipe.sh')
| -rwxr-xr-x | AppImage-Recipe.sh | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/AppImage-Recipe.sh b/AppImage-Recipe.sh index 16024d226..cdf66470f 100755 --- a/AppImage-Recipe.sh +++ b/AppImage-Recipe.sh @@ -34,6 +34,7 @@ fi APP="$1" LOWERAPP="$(echo "$APP" | tr '[:upper:]' '[:lower:]')" VERSION="$2" +export ARCH=x86_64 mkdir -p $APP.AppDir wget -q https://github.com/AppImage/AppImages/raw/master/functions.sh -O ./functions.sh @@ -44,6 +45,8 @@ if [ -d ./usr/lib/x86_64-linux-gnu ]; then LIB_DIR=./usr/lib/x86_64-linux-gnu elif [ -d ./usr/lib/i386-linux-gnu ]; then LIB_DIR=./usr/lib/i386-linux-gnu +elif [ -d ./usr/lib64 ]; then + LIB_DIR=./usr/lib64 fi cd $APP.AppDir @@ -53,7 +56,7 @@ rm -R ./usr/local rmdir ./opt 2> /dev/null # bundle Qt platform plugins and themes -QXCB_PLUGIN="$(find /usr/lib -name 'libqxcb.so' 2> /dev/null)" +QXCB_PLUGIN="$(find /usr/lib* -name 'libqxcb.so' 2> /dev/null)" if [ "$QXCB_PLUGIN" == "" ]; then QXCB_PLUGIN="$(find /opt/qt*/plugins -name 'libqxcb.so' 2> /dev/null)" fi @@ -73,18 +76,22 @@ get_desktop get_icon cat << EOF > ./usr/bin/keepassxc_env #!/usr/bin/env bash -#export QT_QPA_PLATFORMTHEME=gtk2 export LD_LIBRARY_PATH="..$(dirname ${QT_PLUGIN_PATH})/lib:\${LD_LIBRARY_PATH}" export QT_PLUGIN_PATH="..${QT_PLUGIN_PATH}:\${KPXC_QT_PLUGIN_PATH}" # unset XDG_DATA_DIRS to make tray icon work in Ubuntu Unity -# see https://github.com/probonopd/AppImageKit/issues/351 +# see https://github.com/AppImage/AppImageKit/issues/351 unset XDG_DATA_DIRS -exec keepassxc "\$@" +if [ "\${1}" == "cli" ]; then + shift + exec keepassxc-cli "\$@" +else + exec keepassxc "\$@" +fi EOF chmod +x ./usr/bin/keepassxc_env -sed -i 's/Exec=keepassxc/Exec=keepassxc_env/' keepassxc.desktop +sed -i 's/Exec=keepassxc/Exec=keepassxc_env/' org.keepassxc.desktop get_desktopintegration $LOWERAPP GLIBC_NEEDED=$(glibc_needed) @@ -93,5 +100,5 @@ cd .. generate_type2_appimage -mv ../out/*.AppImage .. +mv ../out/*.AppImage ../KeePassXC-${VERSION}-${ARCH}.AppImage rmdir ../out > /dev/null 2>&1 |