X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.profile.d%2Fprompt.bashrc;h=2145c225b89f2f297bab5652f49fd634f44dc823;hp=6398e3dcbb50770cbfc8f8df460103ecfa9b6f19;hb=f00d519dd073659e3a079be65c57d5b64cb60a69;hpb=8a304871323fd8c0ab81b81a9082f07d03a1fa0c diff --git a/.profile.d/prompt.bashrc b/.profile.d/prompt.bashrc index 6398e3d..2145c22 100644 --- a/.profile.d/prompt.bashrc +++ b/.profile.d/prompt.bashrc @@ -4,8 +4,8 @@ SSH_FORWARDED=$(get_remote_ip) if [ ! -z "$SSH_FORWARDED" ]; then if [ "$SSH_FORWARDED" = "localhost" ]; then SSH_FORWARDED= - elif [ -f ~/.ssh/forwarded ]; then - for forwarded in $(< ~/.ssh/forwarded); do + elif [ -f ${PROFILE_HOME:-~}/.ssh/forwarded ]; then + for forwarded in $(< ${PROFILE_HOME:-~}/.ssh/forwarded); do if echo "$SSH_FORWARDED" | grep "$forwarded" &>/dev/null; then SSH_FORWARDED= fi @@ -31,9 +31,9 @@ if ps -o comm= -p $PPID 2>/dev/null | grep '^vim*$' &>/dev/null; then info="$info$vimchild" fi if [ "${TERM##screen}" = "$TERM" ]; then - export PROMPT_COMMAND="echo -ne '\033]0;$info\033\0134\r\033[K'" + PROMPT_COMMAND="echo -ne '\033]0;$info\033\0134\r\033[K'" else - export PROMPT_COMMAND='echo -ne "\033k\033\0134"' + PROMPT_COMMAND='echo -ne "\033k\033\0134"' fi unset blank info vimchild SSH_FORWARDED