From b472ff031a8dde24324a9e52743378406f6853a1 Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <david.oberhollenzer@tele2.at>
Date: Thu, 10 May 2018 14:42:43 +0200
Subject: [PATCH] Move file override functions to seperate helper script file

Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
---
 check_update.sh  |  2 +-
 mk.sh            |  1 +
 util/misc.sh     | 55 ------------------------------------------------
 util/override.sh | 54 +++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 56 insertions(+), 56 deletions(-)
 create mode 100644 util/override.sh

diff --git a/check_update.sh b/check_update.sh
index 17bd71b..f6cb249 100755
--- a/check_update.sh
+++ b/check_update.sh
@@ -10,7 +10,7 @@ export LINUXPKG="linux"
 # utilities
 source "$SCRIPTDIR/util/depends.sh"
 source "$SCRIPTDIR/util/version.sh"
-source "$SCRIPTDIR/util/misc.sh"
+source "$SCRIPTDIR/util/override.sh"
 
 # check all packages
 for pkg in $SCRIPTDIR/pkg/*; do
diff --git a/mk.sh b/mk.sh
index 5283d0c..8e79d3d 100755
--- a/mk.sh
+++ b/mk.sh
@@ -58,6 +58,7 @@ source "$SCRIPTDIR/util/download.sh"
 source "$SCRIPTDIR/util/pkgcmd.sh"
 source "$SCRIPTDIR/util/toolchain.sh"
 source "$SCRIPTDIR/util/misc.sh"
+source "$SCRIPTDIR/util/override.sh"
 
 ############################## toolchain config ##############################
 include_merge "TOOLCHAIN"
diff --git a/util/misc.sh b/util/misc.sh
index 356cb64..e2adc72 100644
--- a/util/misc.sh
+++ b/util/misc.sh
@@ -1,58 +1,3 @@
-file_path_override() {
-	if [ -e "$SCRIPTDIR/product/$PRODUCT/$BOARD/$1" ]; then
-		echo "$SCRIPTDIR/product/$PRODUCT/$BOARD/$1"
-		return
-	fi
-	if [ -e "$SCRIPTDIR/product/$PRODUCT/$1" ]; then
-		echo "$SCRIPTDIR/product/$PRODUCT/$1"
-		return
-	fi
-	if [ -e "$SCRIPTDIR/board/$BOARD/$1" ]; then
-		echo "$SCRIPTDIR/board/$BOARD/$1"
-		return
-	fi
-}
-
-cat_file_override() {
-	local path=$(file_path_override "$1")
-
-	if [ ! -z "$path" ]; then
-		cat "$path"
-	fi
-}
-
-cat_file_merge() {
-	if [ -e "$SCRIPTDIR/product/$PRODUCT/$BOARD/$1" ]; then
-		cat "$SCRIPTDIR/product/$PRODUCT/$BOARD/$1"
-	fi
-	if [ -e "$SCRIPTDIR/product/$PRODUCT/$1" ]; then
-		cat "$SCRIPTDIR/product/$PRODUCT/$1"
-	fi
-	if [ -e "$SCRIPTDIR/board/$BOARD/$1" ]; then
-		cat "$SCRIPTDIR/board/$BOARD/$1"
-	fi
-}
-
-include_override() {
-	local path=$(file_path_override "$1")
-
-	if [ ! -z "$path" ]; then
-		source "$path"
-	fi
-}
-
-include_merge() {
-	if [ -e "$SCRIPTDIR/board/$BOARD/$1" ]; then
-		source "$SCRIPTDIR/board/$BOARD/$1"
-	fi
-	if [ -e "$SCRIPTDIR/product/$PRODUCT/$1" ]; then
-		source "$SCRIPTDIR/product/$PRODUCT/$1"
-	fi
-	if [ -e "$SCRIPTDIR/product/$PRODUCT/$BOARD/$1" ]; then
-		source "$SCRIPTDIR/product/$PRODUCT/$BOARD/$1"
-	fi
-}
-
 apply_patches() {
 	local PATCH
 
diff --git a/util/override.sh b/util/override.sh
new file mode 100644
index 0000000..9dfb670
--- /dev/null
+++ b/util/override.sh
@@ -0,0 +1,54 @@
+file_path_override() {
+	if [ -e "$SCRIPTDIR/product/$PRODUCT/$BOARD/$1" ]; then
+		echo "$SCRIPTDIR/product/$PRODUCT/$BOARD/$1"
+		return
+	fi
+	if [ -e "$SCRIPTDIR/product/$PRODUCT/$1" ]; then
+		echo "$SCRIPTDIR/product/$PRODUCT/$1"
+		return
+	fi
+	if [ -e "$SCRIPTDIR/board/$BOARD/$1" ]; then
+		echo "$SCRIPTDIR/board/$BOARD/$1"
+		return
+	fi
+}
+
+cat_file_override() {
+	local path=$(file_path_override "$1")
+
+	if [ ! -z "$path" ]; then
+		cat "$path"
+	fi
+}
+
+cat_file_merge() {
+	if [ -e "$SCRIPTDIR/product/$PRODUCT/$BOARD/$1" ]; then
+		cat "$SCRIPTDIR/product/$PRODUCT/$BOARD/$1"
+	fi
+	if [ -e "$SCRIPTDIR/product/$PRODUCT/$1" ]; then
+		cat "$SCRIPTDIR/product/$PRODUCT/$1"
+	fi
+	if [ -e "$SCRIPTDIR/board/$BOARD/$1" ]; then
+		cat "$SCRIPTDIR/board/$BOARD/$1"
+	fi
+}
+
+include_override() {
+	local path=$(file_path_override "$1")
+
+	if [ ! -z "$path" ]; then
+		source "$path"
+	fi
+}
+
+include_merge() {
+	if [ -e "$SCRIPTDIR/board/$BOARD/$1" ]; then
+		source "$SCRIPTDIR/board/$BOARD/$1"
+	fi
+	if [ -e "$SCRIPTDIR/product/$PRODUCT/$1" ]; then
+		source "$SCRIPTDIR/product/$PRODUCT/$1"
+	fi
+	if [ -e "$SCRIPTDIR/product/$PRODUCT/$BOARD/$1" ]; then
+		source "$SCRIPTDIR/product/$PRODUCT/$BOARD/$1"
+	fi
+}