Flatpak: Do not start gpg-agent in the Fedora build

This is looking for a system-installed pinentry, in contrast to
the Flathub build, which builds its own pinentry, thus no need
to override where the pinentry is installed in the Fedora Flatpak.
This commit is contained in:
Milan Crha 2020-11-23 11:28:57 +01:00
parent 085d0a5ca3
commit e6383f64f6

View File

@ -7,8 +7,6 @@ else
export GIO_USE_NETWORK_MONITOR=base export GIO_USE_NETWORK_MONITOR=base
gsettings reset org.gnome.evolution-data-server network-monitor-gio-name gsettings reset org.gnome.evolution-data-server network-monitor-gio-name
gpg-agent --homedir ~/.gnupg --daemon --pinentry-program=/app/bin/pinentry
LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @SOURCES_SERVICE@ | wc -l) LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @SOURCES_SERVICE@ | wc -l)
if [ "${LINES}" = "0" ]; then if [ "${LINES}" = "0" ]; then
/app/libexec/evolution-source-registry & /app/libexec/evolution-source-registry &
@ -28,6 +26,4 @@ else
fi fi
/app/bin/evolution.bin "$@" /app/bin/evolution.bin "$@"
pkill -TERM gpg-agent
fi fi