aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-11-30 14:16:22 +1300
committerTom Ryder <tom@sanctum.geek.nz>2018-11-30 14:16:22 +1300
commit4f674a8355ec3db6d491e83fdf6e0961e61c1486 (patch)
tree16d6ea978ab591e33060694dbf89531cf4a57b29
parentRemove redundant return short-circuit (diff)
downloaddotfiles-4f674a8355ec3db6d491e83fdf6e0961e61c1486.tar.gz
dotfiles-4f674a8355ec3db6d491e83fdf6e0961e61c1486.zip
Suppress a couple of ShellCheck errors
-rw-r--r--bash/bashrc1
-rw-r--r--bash/bashrc.d/pushd.bash1
2 files changed, 2 insertions, 0 deletions
diff --git a/bash/bashrc b/bash/bashrc
index b8ecec01..dcf3df53 100644
--- a/bash/bashrc
+++ b/bash/bashrc
@@ -22,6 +22,7 @@ if [ -n "$ENV" ] ; then
fi
# Ensure we're using at least version 3.0
+# shellcheck disable=SC2128
[ -n "$BASH_VERSINFO" ] || return # Check version array exists (>=2.0)
((BASH_VERSINFO[0] >= 3)) || return # Check actual major version number
diff --git a/bash/bashrc.d/pushd.bash b/bash/bashrc.d/pushd.bash
index ec621037..e708d3e8 100644
--- a/bash/bashrc.d/pushd.bash
+++ b/bash/bashrc.d/pushd.bash
@@ -1,4 +1,5 @@
# Make pushd default to $HOME if no arguments given, much like cd
pushd() {
+ # shellcheck disable=SC2164
builtin pushd "${@:-"$HOME"}"
}