Some fixes

[perso/Immae/Config/Ansible.git] / roles / shell / bash / templates / bash_profile.j2

diff --git a/roles/shell/bash/templates/bash_profile.j2 b/roles/shell/bash/templates/bash_profile.j2
index 9b9e86c9df32bdbe80ab15988e9f14d241d146a2..5be21a9a2e3cebd458b50cbab5862f705fba85c1 100644 (file)
--- a/roles/shell/bash/templates/bash_profile.j2
+++ b/roles/shell/bash/templates/bash_profile.j2
@@ -1,10 +1,13 @@
 # Some variables are loaded via pam (see .config/pam_environment)
+# This file is loaded thanks to as line in /etc/profile
+# test "$BASH" && test -r "$XDG_CONFIG_HOME/bash/bash_profile" && . $XDG_CONFIG_HOME/bash/bash_profile
 
-[[ -f ~/.bashrc ]] && . ~/.bashrc
+# Loaded by /etc/profile already
+# [[ -f $XDG_CONFIG_HOME/bash/bashrc ]] && . $XDG_CONFIG_HOME/bash/bashrc
 {% if "graphical_vt" in features.get(profile, []) %}
 
-if [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
-  [[ -f "$HOME/.bashrc_temp" ]] && rm -f $HOME/.bashrc_temp
+if [[ ! $DISPLAY && $XDG_VTNR -eq {{ lookup('env', "XDG_VTNR") | default(1, true) }} ]]; then
+  [[ -f "$XDG_STATE_HOME/bash/bashrc_temp" ]] && rm -f $XDG_STATE_HOME/bash/bashrc_temp
   exec startx $XDG_CONFIG_HOME/xinitrc > $XDG_STATE_HOME/xsession_errors 2>&1
 fi
 {% endif %}