2018-07-23 17:52:28 +01:00
|
|
|
--- a/gnome-session/gnome-session.in
|
|
|
|
|
+++ b/gnome-session/gnome-session.in
|
2018-08-04 14:17:32 +01:00
|
|
|
@@ -3,11 +3,11 @@
|
|
|
|
|
if [ "x$XDG_SESSION_TYPE" = "xwayland" ] &&
|
|
|
|
|
[ "x$XDG_SESSION_CLASS" != "xgreeter" ] &&
|
|
|
|
|
[ -n "$SHELL" ] &&
|
|
|
|
|
- grep -q "$SHELL" /etc/shells &&
|
|
|
|
|
- ! (echo "$SHELL" | grep -q "false") &&
|
|
|
|
|
- ! (echo "$SHELL" | grep -q "nologin"); then
|
|
|
|
|
+ @grep@ -q "$SHELL" /etc/shells &&
|
|
|
|
|
+ ! (echo "$SHELL" | @grep@ -q "false") &&
|
|
|
|
|
+ ! (echo "$SHELL" | @grep@ -q "nologin"); then
|
|
|
|
|
if [ "$1" != '-l' ]; then
|
|
|
|
|
- exec bash -c "exec -l '$SHELL' -c '$0 -l $*'"
|
|
|
|
|
+ exec @bash@ -c "exec -l '$SHELL' -c '$0 -l $*'"
|
|
|
|
|
else
|
|
|
|
|
shift
|
|
|
|
|
fi
|
|
|
|
|
@@ -13,7 +13,7 @@
|
2018-07-23 17:52:28 +01:00
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
2018-09-05 01:47:52 +01:00
|
|
|
-SETTING=$(G_MESSAGES_DEBUG= gsettings get org.gnome.system.locale region)
|
|
|
|
|
+SETTING=$(G_MESSAGES_DEBUG= @gsettings@ get org.gnome.system.locale region)
|
2018-07-23 17:52:28 +01:00
|
|
|
REGION=${SETTING#\'}
|
|
|
|
|
REGION=${REGION%\'}
|
|
|
|
|
|
|
|
|
|
--- a/gnome-session/main.c
|
|
|
|
|
+++ b/gnome-session/main.c
|
|
|
|
|
@@ -203,7 +203,7 @@
|
|
|
|
|
}
|
|
|
|
|
new_argv[i + 2] = NULL;
|
|
|
|
|
|
|
|
|
|
- if (!execvp ("dbus-launch", new_argv)) {
|
|
|
|
|
+ if (!execvp ("@dbusLaunch@", new_argv)) {
|
|
|
|
|
g_set_error (error,
|
|
|
|
|
G_SPAWN_ERROR,
|
|
|
|
|
G_SPAWN_ERROR_FAILED,
|
