diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-12-19 11:11:42 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-12-19 11:11:42 +1300 |
commit | 84f9ddc9214401bdb7e5f6f3e5133d24b29e4917 (patch) | |
tree | 88dc8ad4a3df161792718e7718c79d17ee6d5254 /sh/shrc.d/prompt.sh | |
parent | Merge branch 'release/v3.2.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-84f9ddc9214401bdb7e5f6f3e5133d24b29e4917.tar.gz dotfiles-84f9ddc9214401bdb7e5f6f3e5133d24b29e4917.zip |
Merge branch 'release/v3.3.0'v3.3.0
* release/v3.3.0:
Bump VERSION
Add sh.vim mapping to insert '\'' quickly
Remove now-unneeded shellcheck disable rules
Follow ShellCheck's recommendation of -z over !-n
Adjust PS1-PS4 reset
Use exec for clearer subshell semantics
Use `command` consistently, silence ShellCheck
Add /j flag to :vimgrep shortcut
Diffstat (limited to 'sh/shrc.d/prompt.sh')
-rw-r--r-- | sh/shrc.d/prompt.sh | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/sh/shrc.d/prompt.sh b/sh/shrc.d/prompt.sh index 30e4e9d8..cb32c113 100644 --- a/sh/shrc.d/prompt.sh +++ b/sh/shrc.d/prompt.sh @@ -1,8 +1,15 @@ -# Some systems' /etc/profile setups export PS1, which really fouls things up -# when switching between non-login shells; let's put things right by unsetting -# it to break the export and then just setting them as simple variables -unset PS1 PS2 PS3 PS4 -PS1='$ ' PS2='> ' PS3='? ' PS4='+ ' +# Some systems' /etc/profile setups export their prompt strings (PS1, PS2...), +# which really fouls things up when switching between non-login shells; let's +# put things right by unsetting each of them to break the export, and then just +# setting them as simple variables +unset PS1 +PS1='$ ' +unset PS2 +PS2='> ' +unset PS3 +PS3='? ' +unset PS4 +PS4='+ ' # If we have an SSH_CLIENT or SSH_CONNECTION environment variable, put the # hostname in PS1 too. |