aboutsummaryrefslogtreecommitdiff
path: root/ksh
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2016-12-27 02:46:46 +1300
committerTom Ryder <tom@sanctum.geek.nz>2016-12-27 02:46:46 +1300
commitfa3b812ed0b1b5988d9b5a48581d157b35ab8fad (patch)
treecce10030688de84dcec1d0e3509a4f6ce552c0d9 /ksh
parentMerge branch 'master' into port/bsd/netbsd (diff)
parentAdd workaround to what looks like a bug to me (diff)
downloaddotfiles-fa3b812ed0b1b5988d9b5a48581d157b35ab8fad.tar.gz
dotfiles-fa3b812ed0b1b5988d9b5a48581d157b35ab8fad.zip
Merge branch 'master' into port/bsd/netbsd
Diffstat (limited to 'ksh')
-rw-r--r--ksh/kshrc.d/prompt.ksh7
1 files changed, 2 insertions, 5 deletions
diff --git a/ksh/kshrc.d/prompt.ksh b/ksh/kshrc.d/prompt.ksh
index 99e193b2..063f5210 100644
--- a/ksh/kshrc.d/prompt.ksh
+++ b/ksh/kshrc.d/prompt.ksh
@@ -20,15 +20,11 @@ function prompt {
# Add sub-commands; working directory with ~ abbreviation, VCS, job
# count, and previous command return value
- PS1=$PS1'$(prompt pwd)$(prompt vcs)$(prompt job)$(prompt ret)'
+ PS1=$PS1'$(ret=$?;prompt pwd;prompt vcs;prompt job;prompt ret)'
# Add prefix and suffix
PS1='${PROMPT_PREFIX}'$PS1'${PROMPT_SUFFIX}'
- # Add a wrapper around the prompt as determined so far so that the
- # return value from the previous command doesn't get lost
- PS1='$(ret=$?;printf %s "'"$PS1"'")'
-
# Add terminating "$" or "#" sign
PS1=$PS1'\$'
@@ -190,6 +186,7 @@ function prompt {
# Show return status of previous command in angle brackets, if not zero
ret)
+ # shellcheck disable=SC2154
((ret)) && printf '<%u>' "$ret"
;;