git.iko.soy/unity8
on xenial help sign in
Don't override scope list if already specified
8df1214Michal Hruby
data/unity8.conf+4−2
compare with xenial
unifiedsplit
@@ -28,8 +28,10 @@ pre-start script
28 initctl set-env --global MIR_SOCKET=$MIR_SERVER_FILE
28 initctl set-env --global MIR_SOCKET=$MIR_SERVER_FILE
29 gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SOCKET': '$MIR_SERVER_FILE'}"
29 gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SOCKET': '$MIR_SERVER_FILE'}"
30 fi
30 fi
31+ if [ -n "$UNITY_SCOPES_LIST" ]; then
31− # FIXME: remove once we have this in dconf
32+ # FIXME: remove once we have this in dconf
32− initctl set-env UNITY_SCOPES_LIST="scopes;clickscope;musicaggregator;videoaggregator"
33+ initctl set-env UNITY_SCOPES_LIST="scopes;clickscope;musicaggregator;videoaggregator"
34+ fi
33end script
35end script
34
36
35exec ${BINARY:-unity8} $ARGS
37exec ${BINARY:-unity8} $ARGS