public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kde5.startkde: update script based on plasma-workspace-5.7.1

Browse Source
This commit is contained in:
Thomas Tuegel 2016-07-15 18:25:15 -05:00
parent 32c1f05aed
commit 475ad4c7c3
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/desktops/kde-5/plasma/startkde/startkde.sh
View File

@ -77,7 +77,7 @@ kcminputrc Mouse cursorTheme 'breeze_cursors'
kcminputrc Mouse cursorSize '' kcminputrc Mouse cursorSize ''
ksplashrc KSplash Theme Breeze ksplashrc KSplash Theme Breeze
ksplashrc KSplash Engine KSplashQML ksplashrc KSplash Engine KSplashQML
kdeglobals KScreen ScaleFactor 1 kdeglobals KScreen ScreenScaleFactors ''
kcmfonts General forceFontDPI 0 kcmfonts General forceFontDPI 0
EOF EOF
@ -157,20 +157,6 @@ xsetroot -cursor_name left_ptr
dl=$DESKTOP_LOCKED dl=$DESKTOP_LOCKED
unset DESKTOP_LOCKED # Don't want it in the environment unset DESKTOP_LOCKED # Don't want it in the environment
# Make sure that D-Bus is running
# D-Bus autolaunch is broken
if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
eval $(dbus-launch --sh-syntax --exit-with-session)
fi
if qdbus >/dev/null 2>/dev/null; then
: # ok
else
echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2
test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
exit 1
fi
ksplash_pid= ksplash_pid=
if test -z "$dl"; then if test -z "$dl"; then
# the splashscreen and progress indicator # the splashscreen and progress indicator
@ -209,6 +195,16 @@ done
echo 'startkde: Starting up...' 1>&2 echo 'startkde: Starting up...' 1>&2
# Make sure that D-Bus is running
if $qdbus >/dev/null 2>/dev/null; then
: # ok
else
echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2
test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
exit 1
fi
# Mark that full KDE session is running (e.g. Konqueror preloading works only # Mark that full KDE session is running (e.g. Konqueror preloading works only
# with full KDE running). The KDE_FULL_SESSION property can be detected by # with full KDE running). The KDE_FULL_SESSION property can be detected by
# any X client connected to the same X session, even if not launched # any X client connected to the same X session, even if not launched
@ -255,7 +251,7 @@ if test -n "$PAM_KWALLET5_LOGIN" ; then
fi fi
# At this point all environment variables are set, let's send it to the DBus session server to update the activation environment # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
ksyncdbusenv dbus-update-activation-environment --systemd --all
if test $? -ne 0; then if test $? -ne 0; then
# Startup error # Startup error
echo 'startkde: Could not sync environment to dbus.' 1>&2 echo 'startkde: Could not sync environment to dbus.' 1>&2
@ -275,6 +271,8 @@ if test $? -ne 0; then
exit 1 exit 1
fi fi
qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit
# (NixOS) Run kbuildsycoca5 before starting the user session because things # (NixOS) Run kbuildsycoca5 before starting the user session because things
# may be missing or moved if they have run nixos-rebuild and it may not be # may be missing or moved if they have run nixos-rebuild and it may not be
# possible for them to start Konsole to run it manually! # possible for them to start Konsole to run it manually!