erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-10-06 14:07:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

fix(linux): Fix debian postinst script

Browse source 
The ibus-keyman post-installation script failed, causing the entire
installation to fail. This change removes `set -e` so that we try
to run the rest of the commands even when one command should fail.
Also accounts for ibus-daemon being started with the full path,
and start ibus-daemon with fill path as well.

(cherry picked from commit 9c1500fe57)
This commit is contained in:
Eberhard Beilharz 2023-02-22 19:40:22 +01:00
parent af697f5377
commit c8a0cc4f4a
No known key found for this signature in database
GPG key ID: E9140597606020D3
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
linux/debian/ibus-keyman.postinst
View file

@ -1,10 +1,13 @@
#!/bin/sh
set -e
# Don't call `set -e`. Even if some commands should fail, it's still
# worth running the rest of the commands.
case "$1" in
configure)
# (Re-)Start IBus
# if don't have sudo and ps then don't attempt to restart ibus
if which sudo > /dev/null && which ps > /dev/null; then
@ -37,20 +40,20 @@ case "$1" in
fi
# Verify that it's running now
if [ ! -z $SUDO_USER ] && id $SUDO_USER > /dev/null 2>/dev/null; then
! ibusdaemon=$(ps --user $SUDO_USER -o s= -o cmd | grep --regexp="^[^ZT] ibus-daemon .*--xim.*")
if [ "x$ibusdaemon" = "x" ]; then
if [ -n "$SUDO_USER" ] && id "$SUDO_USER" > /dev/null 2>/dev/null; then
ibusdaemon=$(ps --user "$SUDO_USER" -o s= -o cmd | grep --regexp="^[^ZT] \(/usr/bin/\)\?ibus-daemon .*--xim.*")
if [ "$ibusdaemon" = "" ]; then
# otherwise try to start it for the user installing the package
if [ "x$is_gnome_shell" = "x1" ]; then
for session in $(loginctl show-user ${SUDO_USER} -p Sessions --value); do
case $(loginctl show-session ${session} -p Type --value) in
wayland) sudo -H -u "${SUDO_USER}" -i WAYLAND_DISPLAY=wayland-0 -- ibus-daemon -d -r --xim --panel disable;;
x11) sudo -H -u "${SUDO_USER}" -- ibus-daemon -d -r --xim --panel disable;;
if [ "$is_gnome_shell" = "1" ]; then
for session in $(loginctl show-user "${SUDO_USER}" -p Sessions --value); do
case $(loginctl show-session "${session}" -p Type --value) in
wayland) sudo -H -u "${SUDO_USER}" -i WAYLAND_DISPLAY=wayland-0 -- /usr/bin/ibus-daemon -d -r --xim --panel disable;;
x11) sudo -H -u "${SUDO_USER}" -- /usr/bin/ibus-daemon -d -r --xim --panel disable;;
*) ;;
esac
done
else
sudo -H -u "${SUDO_USER}" -- ibus-daemon -d -r --xim
sudo -H -u "${SUDO_USER}" -- /usr/bin/ibus-daemon -d -r --xim
fi
fi
fi