diff options
Diffstat (limited to '')
| -rw-r--r-- | bashrc/common/screen.sh | 7 | ||||
| -rw-r--r-- | bashrc/main.sh | 8 |
2 files changed, 5 insertions, 10 deletions
diff --git a/bashrc/common/screen.sh b/bashrc/common/screen.sh index 734ccfb..28a4ef7 100644 --- a/bashrc/common/screen.sh +++ b/bashrc/common/screen.sh @@ -2,18 +2,13 @@ set_screen_title() { # prevent reset_screen_title from calling set_screen_title - if [[ $BASH_COMMAND != "reset_screen_title" ]]; then + if [[ $BASH_COMMAND != "__make_propt" ]]; then echo -ne "\ek$(id -un)@$(hostname):${BASH_COMMAND/ *}\e\\" fi } -reset_screen_title() { - echo -ne "\ek$(id -un)@$(hostname)\e\\" -} - init_preexec_hack() { if [[ $TERM == "screen" ]]; then - export PROMPT_COMMAND=reset_screen_title trap set_screen_title DEBUG fi } diff --git a/bashrc/main.sh b/bashrc/main.sh index e967e53..d8b5a27 100644 --- a/bashrc/main.sh +++ b/bashrc/main.sh @@ -1,10 +1,10 @@ # this file is sourced by all bash shells on startup # test for interactive shell -[[ $- != *i* ]] && return +[[ $- != *i* ]] && exit # return if this script is executed twice -[[ -n $(declare -p _DOTFILES_DIR 2>/dev/null) ]] && return +[[ -n $(declare -p _DOTFILES_DIR 2>/dev/null) ]] && exit declare -r _DOTFILES_DIR="${HOME}/.dotfiles" declare -r _BASHRC_DIR="${_DOTFILES_DIR}/bashrc" @@ -113,7 +113,7 @@ _load common dircolors _load common prompt # screen shelltitle magic -#_load common screen +_load common screen # bash completion _load common bashcomp @@ -125,4 +125,4 @@ _load dist common _load node ${_DISTNAME} # initialize preexec hack last -#init_preexec_hack +init_preexec_hack |