From 7ca66e65899c77f2208edd64ab5454f208ca5933 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Tue, 26 Feb 2019 21:39:58 +0100
Subject: [PATCH] build-package: mv termux_download_deb to scripts/build/

---
 build-package.sh                     | 27 ++-----------------------
 scripts/build/termux_download_deb.sh | 30 ++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 25 deletions(-)
 create mode 100755 scripts/build/termux_download_deb.sh

diff --git a/build-package.sh b/build-package.sh
index 1cc5a7dbb..4328c79aa 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -36,31 +36,8 @@ source scripts/build/termux_step_handle_buildarch.sh
 # Function to get TERMUX_PKG_VERSION from build.sh
 source scripts/build/termux_extract_dep_info.sh
 
-termux_download_deb() {
-	local package=$1
-	local package_arch=$2
-	local version=$3
-	local deb_file=${package}_${version}_${package_arch}.deb
-	for idx in $(seq ${#TERMUX_REPO_URL[@]}); do
-		local TERMUX_REPO_NAME=$(echo ${TERMUX_REPO_URL[$idx-1]} | sed -e 's%https://%%g' -e 's%http://%%g' -e 's%/%-%g')
-		local PACKAGE_FILE_PATH="${TERMUX_REPO_NAME}-${TERMUX_REPO_DISTRIBUTION[$idx-1]}-${TERMUX_REPO_COMPONENT[$idx-1]}-Packages"
-		read -d "\n" PKG_PATH PKG_HASH <<<$(./scripts/get_hash_from_file.py "${TERMUX_COMMON_CACHEDIR}-$arch/$PACKAGE_FILE_PATH" $package $version)
-		if ! [ "$PKG_HASH" = "" ]; then
-			if [ ! "$TERMUX_QUIET_BUILD" = true ]; then
-				echo "Found $package in ${TERMUX_REPO_URL[$idx-1]}/dists/${TERMUX_REPO_DISTRIBUTION[$idx-1]}"
-			fi
-			break
-		fi
-	done
-	if [ "$PKG_HASH" = "" ]; then
-		return 1
-	else
-		termux_download ${TERMUX_REPO_URL[$idx-1]}/${PKG_PATH} \
-				$TERMUX_COMMON_CACHEDIR-$package_arch/${deb_file} \
-				$PKG_HASH
-		return 0
-	fi
-}
+# Function that downloads a .deb (using the termux_download function)
+source scripts/build/termux_download_deb.sh
 
 # Script to download InRelease, verify it's signature and then download Packages.xz by hash
 termux_step_get_repo_files() {
diff --git a/scripts/build/termux_download_deb.sh b/scripts/build/termux_download_deb.sh
new file mode 100755
index 000000000..4a4293c92
--- /dev/null
+++ b/scripts/build/termux_download_deb.sh
@@ -0,0 +1,30 @@
+termux_download_deb() {
+	local package=$1
+	local package_arch=$2
+	local version=$3
+	local deb_file=${package}_${version}_${package_arch}.deb
+	for idx in $(seq ${#TERMUX_REPO_URL[@]}); do
+		local TERMUX_REPO_NAME=$(echo ${TERMUX_REPO_URL[$idx-1]} | sed -e 's%https://%%g' -e 's%http://%%g' -e 's%/%-%g')
+		local PACKAGE_FILE_PATH="${TERMUX_REPO_NAME}-${TERMUX_REPO_DISTRIBUTION[$idx-1]}-${TERMUX_REPO_COMPONENT[$idx-1]}-Packages"
+		read -d "\n" PKG_PATH PKG_HASH <<<$(./scripts/get_hash_from_file.py "${TERMUX_COMMON_CACHEDIR}-$arch/$PACKAGE_FILE_PATH" $package $version)
+		if ! [ "$PKG_HASH" = "" ]; then
+			if [ ! "$TERMUX_QUIET_BUILD" = true ]; then
+				echo "Found $package in ${TERMUX_REPO_URL[$idx-1]}/dists/${TERMUX_REPO_DISTRIBUTION[$idx-1]}"
+			fi
+			break
+		fi
+	done
+	if [ "$PKG_HASH" = "" ]; then
+		return 1
+	else
+		termux_download ${TERMUX_REPO_URL[$idx-1]}/${PKG_PATH} \
+				$TERMUX_COMMON_CACHEDIR-$package_arch/${deb_file} \
+				$PKG_HASH
+		return 0
+	fi
+}
+
+# Make script standalone executable as well as sourceable
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+	termux_download "$@"
+fi