Merge branch 'master' of https://github.com/xlogerais/config-bash

Conflicts: rc.d/zz-powerline
2014-04-09 18:29:16 +02:00
parent 68a41f157f 326c47dc3a
commit fdf83c632e
3 changed files with 19 additions and 2 deletions
--- a/rc.d/zz-powerline
+++ b/rc.d/zz-powerline
@ -7,7 +7,7 @@ POWERLINE_FILE=/usr/share/powerline/bash/powerline.sh
 export URXVT_FONT_NAME="DejaVu Sans Mono for Powerline"
 export URXVT_FONT_SIZE="8"

-if [ -f "${POWERLINE_FILE}" ]
+if [ -f "${POWERLINE_FILE}" -a -z "$SSH_CONNECTION" ]
 then

    xrdb -merge <<"EOF"