rpm/emacs
SHA256
1
0
Fork 0
forked from pool/emacs
Code Pull Requests Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=227
This commit is contained in:
Dr. Werner Fink 2017-04-25 14:51:56 +00:00 committed by Git OBS Bridge
parent e493955ccb
commit 22735a0123
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
emacs.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Apr 25 14:51:25 UTC 2017 - werner@suse.de
- Fix emacs.sh wrapper script to check modern dbus session
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 25 10:43:33 UTC 2017 - werner@suse.de Tue Apr 25 10:43:33 UTC 2017 - werner@suse.de

11
emacs.sh
View File

@ -78,7 +78,12 @@ if test -n "$dbusdaemon" ; then
unset DBUS_SESSION_BUS_ADDRESS unset DBUS_SESSION_BUS_ADDRESS
break break
done done
test -n "$dpid" || unset DBUS_SESSION_BUS_ADDRESS if test -z "$dpid" ; then
case ":$DBUS_SESSION_BUS_ADDRESS" in
*:path=/run/user/${UID}/bus*) ;;
*) unset DBUS_SESSION_BUS_ADDRESS
esac
fi
fi fi
# Find a valid dbus-daemon if active # Find a valid dbus-daemon if active
if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
@ -90,6 +95,10 @@ if test -n "$dbusdaemon" ; then
DBUS_SESSION_BUS_ADDRESS=${dadd#*=} DBUS_SESSION_BUS_ADDRESS=${dadd#*=}
export DBUS_SESSION_BUS_ADDRESS export DBUS_SESSION_BUS_ADDRESS
done done
if test -z "$DBUS_SESSION_BUS_ADDRESS" -a -S /run/user/${UID}/bus ; then
DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${UID}/bus
export DBUS_SESSION_BUS_ADDRESS
fi
fi fi
unset mid guid suid dadd unset mid guid suid dadd
# Oops ... no dbus-daemon then launch a new session # Oops ... no dbus-daemon then launch a new session