- Change the askpass wrapper to not use x11 interface:
* by default we use the -gnome UI (which is gtk3 only, no gnome dep) * if desktop is KDE/LxQt we use ksshaskpass OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=175
This commit is contained in:
parent
39cce89598
commit
728923fa07
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 14 10:29:20 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
|
||||
|
||||
- Change the askpass wrapper to not use x11 interface:
|
||||
* by default we use the -gnome UI (which is gtk3 only, no gnome dep)
|
||||
* if desktop is KDE/LxQt we use ksshaskpass
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 28 10:34:53 UTC 2019 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
|
||||
|
||||
|
38
ssh-askpass
38
ssh-askpass
@ -2,49 +2,23 @@
|
||||
|
||||
SESSION=
|
||||
|
||||
case "$DESKTOP_SESSION" in
|
||||
kde) SESSION=kde ;;
|
||||
gnome) SESSION=gnome ;;
|
||||
esac
|
||||
|
||||
if [ -z "$SESSION" ] ; then
|
||||
WM="${WINDOWMANAGER##*/}"
|
||||
case "$WM" in
|
||||
*kde*) SESSION=kde ;;
|
||||
*gnome*) SESSION=gnome ;;
|
||||
esac
|
||||
if [ -n "$KDE_FULL_SESSION" ] ; then
|
||||
SESSION=kde
|
||||
fi
|
||||
|
||||
if [ -z "$SESSION" ] ; then
|
||||
if [ -n "$KDE_FULL_SESSION" ] ; then
|
||||
SESSION=kde
|
||||
fi
|
||||
if [ -n "$GNOME_DESKTOP_SESSION_ID" ] ; then
|
||||
SESSION=gnome
|
||||
fi
|
||||
if [ "$DESKTOP_SESSION" = "lxqt" ]; then
|
||||
SESSION=kde
|
||||
fi
|
||||
|
||||
GNOME_SSH_ASKPASS="@LIBEXECDIR@/ssh/gnome-ssh-askpass"
|
||||
KDE_SSH_ASKPASS="@LIBEXECDIR@/ssh/ksshaskpass"
|
||||
X11_SSH_ASKPASS="@LIBEXECDIR@/ssh/x11-ssh-askpass"
|
||||
|
||||
case "$SESSION" in
|
||||
gnome)
|
||||
if [ -f $GNOME_SSH_ASKPASS ]; then
|
||||
exec $GNOME_SSH_ASKPASS ${1+"$@"}
|
||||
else
|
||||
exec $X11_SSH_ASKPASS ${1+"$@"}
|
||||
fi
|
||||
;;
|
||||
kde)
|
||||
if [ -f $KDE_SSH_ASKPASS ]; then
|
||||
exec $KDE_SSH_ASKPASS ${1+"$@"}
|
||||
else
|
||||
exec $X11_SSH_ASKPASS ${1+"$@"}
|
||||
fi
|
||||
exec $KDE_SSH_ASKPASS ${1+"$@"}
|
||||
;;
|
||||
*)
|
||||
exec $X11_SSH_ASKPASS ${1+"$@"}
|
||||
exec $GNOME_SSH_ASKPASS ${1+"$@"}
|
||||
;;
|
||||
esac
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user