From 992b87b816c57e6ac2ea195d18cb1ba6888b5552 Mon Sep 17 00:00:00 2001
From: Travis Swicegood <travis@domain51.com>
Date: Wed, 5 Dec 2018 21:00:59 -0600
Subject: [PATCH] Shellcheck clean up based on comments from @nwinkler

---
 scripts/reloader.bash | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/reloader.bash b/scripts/reloader.bash
index b208a98c..cac77a21 100644
--- a/scripts/reloader.bash
+++ b/scripts/reloader.bash
@@ -1,11 +1,12 @@
 #!/bin/bash
-pushd "${BASH_IT}" >/dev/null
+pushd "${BASH_IT}" >/dev/null || exit 1
 
 # TODO: Add debugging output
 
 if [ "$1" != "false" ] && [ -d "./enabled" ]; then
-  for _bash_it_config_file in $(ls ./enabled/*${1}.bash 2>/dev/null); do
+  for _bash_it_config_file in $(sort <(compgen -G "./enabled/*${1}.bash")); do
     if [ -e "${_bash_it_config_file}" ]; then
+      # shellcheck source=/dev/null
       source $_bash_it_config_file
     else
       echo "Unable to read ${_bash_it_config_file}" > /dev/stderr
@@ -16,8 +17,9 @@ fi
 
 if [ ! -z "${2}" ] && [ -d "${2}/enabled" ]; then
   # TODO: We should warn users they're using legacy enabling
-  for _bash_it_config_file in $(ls ./${2}/enabled/*.bash 2>/dev/null); do
+  for _bash_it_config_file in $(sort <(compgen -G "./${2}/enabled/*.bash")); do
     if [ -e "$_bash_it_config_file" ]; then
+      # shellcheck source=/dev/null
       source "$_bash_it_config_file"
     else
       # TODO Display an error?
@@ -27,4 +29,4 @@ if [ ! -z "${2}" ] && [ -d "${2}/enabled" ]; then
 fi
 
 unset _bash_it_config_file
-popd >/dev/null
+popd >/dev/null || exit 1