diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2016-12-27 02:26:00 +1300 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2016-12-27 02:26:00 +1300 |
| commit | 90dcadfb2e6e82b7d5e9bdbac2c109433f70caf7 (patch) | |
| tree | c4d5ba26f25be189cf76fd6eef1103b9fe068b84 /bash | |
| parent | Add another issue (diff) | |
| download | dotfiles-90dcadfb2e6e82b7d5e9bdbac2c109433f70caf7.tar.gz dotfiles-90dcadfb2e6e82b7d5e9bdbac2c109433f70caf7.zip | |
Realised easy win avoiding subshells
And also the PROMPT_RETURN fudge in Bash/Zsh
Diffstat (limited to 'bash')
| -rw-r--r-- | bash/bashrc.d/prompt.bash | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/bash/bashrc.d/prompt.bash b/bash/bashrc.d/prompt.bash index 776ac8a6..d923ef20 100644 --- a/bash/bashrc.d/prompt.bash +++ b/bash/bashrc.d/prompt.bash @@ -6,11 +6,8 @@ prompt() { # Turn complex, colored PS1 and debugging PS4 prompts on on) - # Declare the PROMPT_RETURN variable as an integer - declare -i PROMPT_RETURN - # Set up pre-prompt command - PROMPT_COMMAND='PROMPT_RETURN=$? ; history -a' + PROMPT_COMMAND='history -a' # If Bash 4.0 is available, trim very long paths in prompt ((BASH_VERSINFO[0] >= 4)) && PROMPT_DIRTRIM=4 @@ -23,7 +20,7 @@ prompt() { PS1=$PS1'\w' # Add sub-commands; VCS, job, and return status checks - PS1=$PS1'$(prompt vcs)$(prompt job)$(prompt ret)' + PS1=$PS1'$(ret=$?;prompt vcs;prompt job;prompt ret)' # Add prefix and suffix PS1='${PROMPT_PREFIX}'$PS1'${PROMPT_SUFFIX}' @@ -83,7 +80,7 @@ prompt() { # Revert to simple inexpensive prompts off) - unset -v PROMPT_COMMAND PROMPT_DIRTRIM PROMPT_RETURN + unset -v PROMPT_COMMAND PROMPT_DIRTRIM PS1='\$ ' PS2='> ' PS3='? ' @@ -218,7 +215,7 @@ prompt() { # Show return status of previous command in angle brackets, if not zero ret) - ((PROMPT_RETURN)) && printf '<%u>' "$PROMPT_RETURN" + ((ret)) && printf '<%u>' "$ret" ;; # Show the count of background jobs in curly brackets, if not zero |