diff options
Diffstat (limited to 'desktop/icewm/xinitrc.icewm')
| -rw-r--r-- | desktop/icewm/xinitrc.icewm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/desktop/icewm/xinitrc.icewm b/desktop/icewm/xinitrc.icewm index 18d62cfa72..f4ca6237ec 100644 --- a/desktop/icewm/xinitrc.icewm +++ b/desktop/icewm/xinitrc.icewm @@ -11,19 +11,19 @@ sysmodmap=/etc/X11/xinit/.Xmodmap [ -f $userresources ] && /usr/bin/xrdb -merge $userresources [ -f $usermodmap ] && /usr/bin/xmodmap $usermodmap -# Create default user directory & populate it if it does not already exist -if [ ! -d $HOME/.icewm ]; then - mkdir $HOME/.icewm - for FILE in keys menu preferences toolbar winoptions; - do cat /usr/share/icewm/$FILE > $HOME/.icewm/$FILE; - done -fi +# Create default user directory & populate it if needed +mkdir -p ${HOME}/.icewm +for FILE in keys menu preferences shutdown startup toolbar winoptions ; do + if [ ! -e ${HOME}/.icewm/${FILE} ]; then + cat /usr/share/icewm/${FILE} > ${HOME}/.icewm/${FILE} ; + fi +done # Start IceWM icewmbg & icewmtray & -if [ -z "$XDG_SESSION_COOKIE" -a -x /usr/bin/ck-launch-session ]; then +if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then ck-launch-session dbus-launch --exit-with-session icewm-session else exec icewm-session |