Resolve lint warnings

kgryte · kgryte · commit 377869801ff2 · 2018-09-08T02:28:49.000-07:00
diff --git a/tools/git/hooks/post-merge b/tools/git/hooks/post-merge
@@ -24,10 +24,7 @@
 #
 # This hook cannot does __not__ affect the outcome of `git merge` and is not executed if merge fails due to conflicts.
 
-
-# VARIABLES #
-
-is_squash="$1"
+# shellcheck disable=SC2181
 
 
 # FUNCTIONS #
@@ -47,13 +44,16 @@ cleanup() {
 
 # Checks if Node.js module dependencies have changed.
 check_node_deps() {
+	local changed_files
+	local package_json
+
 	echo 'Checking changed files...' >&2
 
 	# Get a list of changed files:
-	local changed_files=$(git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD)
+	changed_files=$(git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD)
 
 	# See if the root `package.json` is one of the files which changed:
-	local package_json=$(echo "${changed_files}" | grep '^package\.json$')
+	package_json=$(echo "${changed_files}" | grep '^package\.json$')
 
 	# If the root `package.json` changed, return a non-zero status...
 	if [[ -n "${package_json}" ]]; then
diff --git a/tools/git/hooks/pre-commit b/tools/git/hooks/pre-commit
@@ -20,6 +20,9 @@
 #
 # This hook is called with no arguments.
 
+# shellcheck disable=SC2181
+
+
 # VARIABLES #
 
 # Determine root directory:
@@ -58,16 +61,19 @@ cleanup() {
 
 # Checks for non-ASCII filenames (to ensure cross platform portability).
 check_filenames() {
-	local commit=$(git rev-parse --verify HEAD)
+	local num_files
 	local against
+	local commit
+
+	commit=$(git rev-parse --verify HEAD)
 	if [[ -z "${commit}" ]]; then
 		# This is the initial commit, so we diff against an empty tree object:
 		against='4b825dc642cb6eb9a060e54bf8d69288fbee4904'
 	else
 		against='HEAD'
 	fi
 	# We exploit the fact that the printable range starts with the space character and ends with the tilde. Note that the use of brackets around a `tr` range is okay here, (for portability to Solaris 10's /usr/bin/tr, it's even required), since the square bracket bytes happen to fall in the designated range.
-	local num_files=$(git diff --cached --name-only --diff-filter=A -z "${against}" | LC_ALL=C tr -d '[ -~]\0' | wc -c)
+	num_files=$(git diff --cached --name-only --diff-filter=A -z "${against}" | LC_ALL=C tr -d '[ -~]\0' | wc -c)
 
 	if [[ "${num_files}" -ne 0 ]]; then
 		echo 'Error: Attempting to add a non-ASCII filename. Non-ASCII filenames limit cross-platform portability. Please rename offending files before committing.' >&2
diff --git a/tools/git/hooks/pre-push b/tools/git/hooks/pre-push
@@ -31,14 +31,15 @@
 # <local ref> <local sha1> <remote ref> <remote sha1>
 # ```
 
+# shellcheck disable=SC2181
+
 
 # VARIABLES #
 
 remote="$1"
-url="$2"
 
 # Determine the current branch:
-export GIT_CURRENT_BRANCH=$(git name-rev --name-only HEAD)
+GIT_CURRENT_BRANCH=$(git name-rev --name-only HEAD)
 
 # Determine root directory:
 root=$(git rev-parse --show-toplevel)
@@ -67,7 +68,7 @@ has_commits() {
 	if git branch -r | grep "${GIT_CURRENT_BRANCH}" > /dev/null; then
 		echo 'Remote branch exists.' >&2
 		echo 'Checking for commits to push...' >&2
-		commits=$(git log "${remote}/${GIT_CURRENT_BRANCH}".."${GIT_CURRENT_BRANCH}" --oneline --)
+		commits=$(git log "${remote}/${GIT_CURRENT_BRANCH}..${GIT_CURRENT_BRANCH}" --oneline --)
 	else
 		echo 'Remote branch does not exist.' >&2
 		echo 'Checking for commits to push...' >&2
@@ -86,6 +87,7 @@ check_licenses() {
 	echo 'Checking licenses...' >&2
 	make check-licenses-production > /dev/null 2>&1
 	if [[ "$?" -ne 0 ]]; then
+		# shellcheck disable=SC2016
 		echo 'Detected dependency licensing issues. Run `make check-licenses-production` to see failing dependency licenses.' >&2
 		return 1
 	fi
@@ -108,7 +110,7 @@ main() {
 	fi
 
 	# Get the set of changed files (added and modified):
-	changed_files=$(git diff --name-only --diff-filter AM "${remote}/${GIT_CURRENT_BRANCH}" | sed -e "s#^#${root}\/#")
+	changed_files=$(git diff --name-only --diff-filter AM "${remote}/${GIT_CURRENT_BRANCH}" | sed -e "s#^#${root}\\/#")
 
 	# Run JavaScript example files:
 	files=$(echo "${changed_files}" | grep '/examples/.*\.js$' | grep -v '/examples/fixtures/.*\.js$' | tr '\n' ' ')
