diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2017-01-28 22:53:21 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2017-01-28 22:53:21 +1300 |
commit | 98fd6a8802d2fbf1e7727b188b4ea5acc5f5fc61 (patch) | |
tree | 8a2bb4a03199fb43e1d98965fea0257f4d689d75 /sh | |
parent | Merge branch 'master' into port/bsd/freebsd (diff) | |
parent | Add completion for finger(1) (diff) | |
download | dotfiles-98fd6a8802d2fbf1e7727b188b4ea5acc5f5fc61.tar.gz dotfiles-98fd6a8802d2fbf1e7727b188b4ea5acc5f5fc61.zip |
Merge branch 'master' into port/bsd/freebsd
Diffstat (limited to 'sh')
-rw-r--r-- | sh/profile.d/options.sh | 8 | ||||
-rw-r--r-- | sh/shrc.d/prompt.sh | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/sh/profile.d/options.sh b/sh/profile.d/options.sh index a668a360..1a511d75 100644 --- a/sh/profile.d/options.sh +++ b/sh/profile.d/options.sh @@ -10,15 +10,15 @@ options() { shift # Directory already exists; bail out - [ -d "$dir" ] && exit + [ -d "$dir" ] && return # Create the directory and step into it - command -p mkdir -p -- "$dir" || exit - cd -- "$dir" || exit + command -p mkdir -p -- "$dir" || return + cd -- "$dir" || return # Write the program's --help output to a file, even if it's empty # This probably only works with GNU tools in general - "$prog" --help </dev/null >help 2>/dev/null || exit + "$prog" --help </dev/null >help 2>/dev/null || return # Iterate through remaining arguments (desired options), creating files to # show they're available if found in the help output diff --git a/sh/shrc.d/prompt.sh b/sh/shrc.d/prompt.sh index a481b5bb..f1b67fb4 100644 --- a/sh/shrc.d/prompt.sh +++ b/sh/shrc.d/prompt.sh @@ -3,3 +3,9 @@ # it to break the export and then just setting them as simple variables unset PS1 PS2 PS3 PS4 PS1='$ ' PS2='> ' PS3='? ' PS4='+ ' + +# If we have an SSH_CLIENT or SSH_CONNECTION environment variable, put the +# username and hostname in PS1 too. +if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_CONNECTION" ] ; then + PS1=$(id -nu)'@'$(hostname)'$ ' +fi |