Merge remote-tracking branch 'office/master'

config/xinitrc

@@ -30,7 +30,7 @@ then
 fi
 
 # If we have junest installed DE try them before all others
-sessions_dir_junest="$HOME/.local/share/xsessions"
+sessions_dir_junest="$HOME/.junest/usr/share/xsessions"
 if [ -d "$sessions_dir_junest" ]
 then
     sessions_dirs="$sessions_dir_junest $sessions_dirs"

xsession

@@ -6,7 +6,7 @@
 # Sourced by display managers
 #
 
-. ~/.xprofile
+[ -f ~/.xprofile ] && . ~/.xprofile
 if [ -f ~/.config/override_dm_choice ]
 then
     . ~/.config/xinitrc