diff options
| -rw-r--r-- | bash/bashrc.d/prompt.bash | 8 | ||||
| -rw-r--r-- | ksh/kshrc.d/prompt.ksh | 17 | ||||
| -rw-r--r-- | zsh/zshrc.d/prompt.zsh | 17 |
3 files changed, 4 insertions, 38 deletions
diff --git a/bash/bashrc.d/prompt.bash b/bash/bashrc.d/prompt.bash index 86691a9c..bdea7ace 100644 --- a/bash/bashrc.d/prompt.bash +++ b/bash/bashrc.d/prompt.bash @@ -7,7 +7,7 @@ prompt() { # Turn complex, colored PS1 and debugging PS4 prompts on on) # Set up pre-prompt command - PROMPT_COMMAND='history -a' + PROMPT_COMMAND='PROMPT_RETURN=$?;history -a' # If Bash 4.0 is available, trim very long paths in prompt if ((BASH_VERSINFO[0] >= 4)) ; then @@ -31,7 +31,7 @@ prompt() { ## Preload libraries as prefix PS1='$(prompt preload)'$PS1 ## VCS, job, and return status checks as suffixes - PS1=$PS1'$(ret=$?;prompt vcs;prompt job;prompt ret)' + PS1=$PS1'$(prompt vcs;prompt job;prompt ret)' # Add prefix and suffix PS1='${PROMPT_PREFIX}'$PS1'${PROMPT_SUFFIX}' @@ -267,8 +267,8 @@ prompt() { # Show return status of previous command in angle brackets, if not zero ret) # shellcheck disable=SC2154 - ((ret)) || return - printf '<%u>' "${ret//\\/\\\\}" + ((PROMPT_RETURN)) || return + printf '<%u>' "${PROMPT_RETURN//\\/\\\\}" ;; # Show the count of background jobs in curly brackets, if not zero diff --git a/ksh/kshrc.d/prompt.ksh b/ksh/kshrc.d/prompt.ksh index efc5c4e3..b0023670 100644 --- a/ksh/kshrc.d/prompt.ksh +++ b/ksh/kshrc.d/prompt.ksh @@ -31,8 +31,6 @@ function prompt { esac # Add sub-commands: - ## Preload libraries as prefix - PS1='$(prompt preload)'$PS1 ## VCS, job, and return status checks as suffixes PS1=$PS1'$(ret=$?;jobc=$(jobs -p|sed -n '\''$='\'');prompt pwd;prompt vcs;prompt job;prompt ret;:)' @@ -208,21 +206,6 @@ function prompt { fi ;; - # Analyze LD_PRELOAD to see if we should report anything loaded - preload) - printf '%s:' "$LD_PRELOAD" | - while read -d : -r ; do - case $REPLY in - (*/libip2unix.so) - printf '[IP2Unix]' - ;; - (*/libtorsocks.so) - printf '[Tor]' - ;; - esac - done - ;; - # Abbreviated working directory pwd) case $PWD in diff --git a/zsh/zshrc.d/prompt.zsh b/zsh/zshrc.d/prompt.zsh index 317aba56..eb43484f 100644 --- a/zsh/zshrc.d/prompt.zsh +++ b/zsh/zshrc.d/prompt.zsh @@ -22,8 +22,6 @@ prompt() { esac # Add sub-commands: - ## Preload libraries as prefix - PS1='$(prompt preload)'$PS1 ## VCS, job, and return status checks as suffixes PS1=$PS1'$(ret=$?;prompt vcs;prompt job;prompt ret)' @@ -56,21 +54,6 @@ prompt() { fi ;; - # Analyze LD_PRELOAD to see if we should report anything loaded - preload) - printf '%s:' "$LD_PRELOAD" | - while read -d : -r ; do - case $REPLY in - (*/libip2unix.so) - printf '[IP2Unix]' - ;; - (*/libtorsocks.so) - printf '[Tor]' - ;; - esac - done - ;; - git) # Wrap as compound command; we don't want to see output from any of |