Merge remote-tracking branch 'office/master'

2021-12-02 10:58:11 +01:00 · 2021-12-02 10:58:11 +01:00 · 3ff188c80b
parent 9c82a364ed c4a0a4daef
commit 3ff188c80b
2 changed files with 2 additions and 2 deletions
--- a/config/xinitrc
+++ b/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"
--- a/2
+++ b/2
@ -6,7 +6,7 @@
 # Sourced by display managers
 #

-. ~/.xprofile
+[ -f ~/.xprofile ] && . ~/.xprofile
 if [ -f ~/.config/override_dm_choice ]
 then
    . ~/.config/xinitrc