aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2016-08-17 18:10:01 +1200
committerTom Ryder <tom@sanctum.geek.nz>2016-08-17 18:17:25 +1200
commitc3f5e8496e2850cba524e2a4ade2396cf6092b3c (patch)
treeb8173f5c479e98e964fa29d786398b489280495f
parentUpdate README to reflect change of shell funcs (diff)
downloaddotfiles-c3f5e8496e2850cba524e2a4ade2396cf6092b3c.tar.gz
dotfiles-c3f5e8496e2850cba524e2a4ade2396cf6092b3c.zip
Include shrc.d in check-sh target
Quote a string entirely to appease shellcheck too
-rwxr-xr-xcheck/sh2
-rw-r--r--sh/shrc.d/mysql.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/check/sh b/check/sh
index 47e41c77..ec3ba339 100755
--- a/check/sh
+++ b/check/sh
@@ -1,5 +1,5 @@
#!/bin/sh
-for sh in sh/* sh/profile.d/* ; do
+for sh in sh/* sh/profile.d/* sh/shrc.d/* ; do
[ -f "$sh" ] || continue
sh -n "$sh" || exit
done
diff --git a/sh/shrc.d/mysql.sh b/sh/shrc.d/mysql.sh
index 00b6930c..d37c3ead 100644
--- a/sh/shrc.d/mysql.sh
+++ b/sh/shrc.d/mysql.sh
@@ -11,9 +11,9 @@
# database=bar
#
mysql() {
- if [ -f "$HOME"/.mysql/"$1".cnf ] ; then
+ if [ -f "$HOME/.mysql/$1".cnf ] ; then
shift
- set -- --defaults-extra-file="$HOME"/.mysql/"$1".cnf "$@"
+ set -- --defaults-extra-file="$HOME/.mysql/$1".cnf "$@"
fi
command mysql "$@"
}