aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-01-15 12:28:55 +1300
committerTom Ryder <tom@sanctum.geek.nz>2018-01-15 12:28:55 +1300
commit1185a9f0b92ecc7feeccfb412f9dc81f891f8780 (patch)
tree3705ad17d6d7215020513c836abc0e992372b0b8
parentMerge branch 'feature/bin-review' into develop (diff)
parentRemove unused `self` var from clog(1df) (diff)
downloaddotfiles-1185a9f0b92ecc7feeccfb412f9dc81f891f8780.tar.gz
dotfiles-1185a9f0b92ecc7feeccfb412f9dc81f891f8780.zip
Merge branch 'feature/shellcheck-...' into develop
* feature/shellcheck-0.4.7-review: Remove unused `self` var from clog(1df) Change double-quote printf pattern to single-quote Move ShellCheck line to correct place in sra(1df) Quote EDITOR/VISUAL assignments for clarity Explicitly ignore uninteresting tree(1) opts
-rw-r--r--bin/clog.sh1
-rw-r--r--bin/sra.sh3
-rw-r--r--bin/sshi.sh2
-rw-r--r--sh/profile.d/editor.sh6
-rw-r--r--sh/profile.d/visual.sh2
-rw-r--r--sh/shrc.d/tree.sh1
6 files changed, 8 insertions, 7 deletions
diff --git a/bin/clog.sh b/bin/clog.sh
index 81bfd744..3269c508 100644
--- a/bin/clog.sh
+++ b/bin/clog.sh
@@ -1,5 +1,4 @@
# Record a timestamped message to a logfile, defaulting to ~/.clog
-self=clog
# Build the cat(1) command we'll run, wrapping it in rlwrap(1) if available and
# applicable.
diff --git a/bin/sra.sh b/bin/sra.sh
index f3ed6f71..36a673e1 100644
--- a/bin/sra.sh
+++ b/bin/sra.sh
@@ -3,5 +3,6 @@
exec 3<&0
sls | while read -r hostname ; do
printf 'sra: %s\n' "$hostname"
- ssh -qt -- "$hostname" "$@" <&3 # shellcheck disable=SC2029
+ # shellcheck disable=SC2029
+ ssh -qt -- "$hostname" "$@" <&3
done
diff --git a/bin/sshi.sh b/bin/sshi.sh
index 0d1591f1..4872765d 100644
--- a/bin/sshi.sh
+++ b/bin/sshi.sh
@@ -20,7 +20,7 @@ printf '%s\n' "$SSH_CONNECTION" "${SSH_TTY:-unknown}" |
sh=$(dig -x "$si" +short 2>/dev/null | sed 's/\.$//;1q')
# Print the results in a human-readable format
- printf "%s:%u -> %s:%u (%s)\n" \
+ printf '%s:%u -> %s:%u (%s)\n' \
"${ch:-"$ci"}" "$cp" \
"${sh:-"$si"}" "$sp" \
"$tty"
diff --git a/sh/profile.d/editor.sh b/sh/profile.d/editor.sh
index debb93b6..d8d13e0a 100644
--- a/sh/profile.d/editor.sh
+++ b/sh/profile.d/editor.sh
@@ -1,7 +1,7 @@
# Ideally, we'd use plain old ed(1), but many Linux distributions don't install
# it by default
if command -v ed >/dev/null 2>&1 ; then
- EDITOR=ed
+ EDITOR='ed'
# Failing that, if the system's implementation of ex(1) looks like Vim and we
# have exm(1df) in our $PATH, use the latter to work around Vim's ex mode
@@ -15,11 +15,11 @@ elif (
(*) exit 1 ;;
esac
) >/dev/null 2>&1 ; then
- EDITOR=exm
+ EDITOR='exm'
# Otherwise, we can just call ex(1) directly
else
- EDITOR=ex
+ EDITOR='ex'
fi
export EDITOR
diff --git a/sh/profile.d/visual.sh b/sh/profile.d/visual.sh
index 38ab9893..119d81c7 100644
--- a/sh/profile.d/visual.sh
+++ b/sh/profile.d/visual.sh
@@ -1,3 +1,3 @@
# Use first found implementation of vi(1)
-VISUAL=vi
+VISUAL='vi'
export VISUAL
diff --git a/sh/shrc.d/tree.sh b/sh/shrc.d/tree.sh
index ca134fe2..d462f3e1 100644
--- a/sh/shrc.d/tree.sh
+++ b/sh/shrc.d/tree.sh
@@ -12,6 +12,7 @@ tree() {
case $opt in
n) n=1 ;;
C) C=1 ;;
+ *) ;;
esac
done
[ -z "$C" ] || exit 0