aboutsummaryrefslogtreecommitdiff
path: root/bash
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-07-26 19:20:22 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-07-26 19:20:22 +1200
commit7ebefe15c2765c5aaa7b01085506cfbbd98146d4 (patch)
tree5bdaf5a21635b39163f9eae86d720852bf8ec239 /bash
parentMerge branch 'release/v1.40.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-7ebefe15c2765c5aaa7b01085506cfbbd98146d4.tar.gz
dotfiles-7ebefe15c2765c5aaa7b01085506cfbbd98146d4.zip
Merge branch 'release/v1.41.0'v1.41.0
* release/v1.41.0: Bump VERSION Move NeoVim-specific config to subfile Set 'noruler' in .vimrc Set 'ttymouse' silently Correct VIMRC path for NeoVim install target Stamp down three new ShellCheck 0.5.0 errors Update colon_operator.vim plugin Remove & remaps Spin quickfix_auto_open.vim out into a plugin
Diffstat (limited to 'bash')
-rw-r--r--bash/bashrc.d/pushd.bash2
-rw-r--r--bash/bashrc.d/vared.bash2
2 files changed, 2 insertions, 2 deletions
diff --git a/bash/bashrc.d/pushd.bash b/bash/bashrc.d/pushd.bash
index ec621037..4a6e4be3 100644
--- a/bash/bashrc.d/pushd.bash
+++ b/bash/bashrc.d/pushd.bash
@@ -1,4 +1,4 @@
# Make pushd default to $HOME if no arguments given, much like cd
pushd() {
- builtin pushd "${@:-"$HOME"}"
+ builtin pushd "${@:-"$HOME"}" || return
}
diff --git a/bash/bashrc.d/vared.bash b/bash/bashrc.d/vared.bash
index 9159485b..e024f48a 100644
--- a/bash/bashrc.d/vared.bash
+++ b/bash/bashrc.d/vared.bash
@@ -25,6 +25,6 @@ vared() {
fi
local name
for name ; do
- IFS= read -e -i "${!name}" -p "${prompt:-"$name"=}" -r -- "$name"
+ IFS= read -e -i "${!name}" -p "${prompt:-"$name"=}" -r -- "${name?}"
done
}