From d4ad78dd70ccbc38d7374c6a8914a60844be406a Mon Sep 17 00:00:00 2001
From: "T. Joseph Carter" <tjcarter@spiritsubstance.com>
Date: Sat, 24 Sep 2016 06:31:04 -0700
Subject: [PATCH] Revert "Cosmetic renaming"

This reverts commit 2e24801fe352343083d46230e9b44a2efb5c7278.
---
 build.sh                      |  6 +++---
 scripts/check_deps.sh         | 33 ---------------------------------
 scripts/{common.sh => common} |  2 --
 scripts/dependencies_check    | 30 ++++++++++++++++++++++++++++++
 4 files changed, 33 insertions(+), 38 deletions(-)
 mode change 100644 => 100755 scripts/check_deps.sh
 rename scripts/{common.sh => common} (99%)
 create mode 100644 scripts/dependencies_check

diff --git a/build.sh b/build.sh
index 672d98c..c6abdae 100755
--- a/build.sh
+++ b/build.sh
@@ -156,11 +156,11 @@ export QUILT_NO_DIFF_INDEX=1
 export QUILT_NO_DIFF_TIMESTAMPS=1
 export QUILT_REFRESH_ARGS="-p ab"
 
-source ${SCRIPT_DIR}/common.sh
-source ${SCRIPT_DIR}/check_deps.sh
+source ${SCRIPT_DIR}/common
+source ${SCRIPT_DIR}/dependencies_check
 
 
-check_deps ${BASE_DIR}/depends
+dependencies_check ${BASE_DIR}/depends
 
 mkdir -p ${WORK_DIR}
 log "Begin ${BASE_DIR}"
diff --git a/scripts/check_deps.sh b/scripts/check_deps.sh
old mode 100644
new mode 100755
index e13ff8e..e69de29
--- a/scripts/check_deps.sh
+++ b/scripts/check_deps.sh
@@ -1,33 +0,0 @@
-# bash #
-
-# check_deps
-# $@	Dependnecy files to check
-#
-# Each dependency is in the form of a tool to test for, optionally followed by
-# a : and the name of a package if the package on a Debian-ish system is not
-# named for the tool (i.e., qemu-user-static).
-check_deps()
-{
-	local depfile deps missing
-
-	for depfile in "$@"; do
-		if [[ -e "$depfile" ]]; then
-			deps="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < ${BASE_DIR}/depends)"
-
-		fi
-		for dep in $deps; do
-			if ! hash ${dep%:*} 2>/dev/null; then
-				missing="${missing:+$missing }${dep#*:}"
-			fi
-		done
-	done
-
-	if [[ "$missing" ]]; then
-		echo "Reqired dependencies not installed"
-		echo
-		echo "This can be resolved on Debian/Raspbian systems by installing:"
-		echo "$missing"
-		false
-	fi
-}
-export -f check_deps
diff --git a/scripts/common.sh b/scripts/common
similarity index 99%
rename from scripts/common.sh
rename to scripts/common
index fa8e44f..ad00c08 100644
--- a/scripts/common.sh
+++ b/scripts/common
@@ -1,5 +1,3 @@
-# bash #
-
 log (){
 	date +"[%T] $@" | tee -a ${LOG_FILE}
 }
diff --git a/scripts/dependencies_check b/scripts/dependencies_check
new file mode 100644
index 0000000..4817561
--- /dev/null
+++ b/scripts/dependencies_check
@@ -0,0 +1,30 @@
+# dependencies_check
+# $@	Dependnecy files to check
+#
+# Each dependency is in the form of a tool to test for, optionally followed by
+# a : and the name of a package if the package on a Debian-ish system is not
+# named for the tool (i.e., qemu-user-static).
+dependencies_check()
+{
+	local depfile deps missing
+
+	for depfile in "$@"; do
+		if [[ -e "$depfile" ]]; then
+			deps="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < ${BASE_DIR}/depends)"
+
+		fi
+		for dep in $deps; do
+			if ! hash ${dep%:*} 2>/dev/null; then
+				missing="${missing:+$missing }${dep#*:}"
+			fi
+		done
+	done
+
+	if [[ "$missing" ]]; then
+		echo "Reqired dependencies not installed"
+		echo
+		echo "This can be resolved on Debian/Raspbian systems by installing:"
+		echo "$missing"
+		false
+	fi
+}