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

---
 build-package.sh                              | 29 +------------------
 scripts/build/termux_step_handle_buildarch.sh | 28 ++++++++++++++++++
 2 files changed, 29 insertions(+), 28 deletions(-)
 create mode 100644 scripts/build/termux_step_handle_buildarch.sh

diff --git a/build-package.sh b/build-package.sh
index 1de141cfb..d5ec05c54 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -31,34 +31,7 @@ source scripts/build/termux_step_handle_arguments.sh
 source scripts/build/termux_step_setup_variables.sh
 
 # Save away and restore build setups which may change between builds.
-termux_step_handle_buildarch() {
-	# If $TERMUX_PREFIX already exists, it may have been built for a different arch
-	local TERMUX_ARCH_FILE=/data/TERMUX_ARCH
-	if [ -f "${TERMUX_ARCH_FILE}" ]; then
-		local TERMUX_PREVIOUS_ARCH
-		TERMUX_PREVIOUS_ARCH=$(cat $TERMUX_ARCH_FILE)
-		if [ "$TERMUX_PREVIOUS_ARCH" != "$TERMUX_ARCH" ]; then
-			local TERMUX_DATA_BACKUPDIRS=$TERMUX_TOPDIR/_databackups
-			mkdir -p "$TERMUX_DATA_BACKUPDIRS"
-			local TERMUX_DATA_PREVIOUS_BACKUPDIR=$TERMUX_DATA_BACKUPDIRS/$TERMUX_PREVIOUS_ARCH
-			local TERMUX_DATA_CURRENT_BACKUPDIR=$TERMUX_DATA_BACKUPDIRS/$TERMUX_ARCH
-			# Save current /data (removing old backup if any)
-			if test -e "$TERMUX_DATA_PREVIOUS_BACKUPDIR"; then
-				termux_error_exit "Directory already exists"
-			fi
-			if [ -d /data/data ]; then
-				mv /data/data "$TERMUX_DATA_PREVIOUS_BACKUPDIR"
-			fi
-			# Restore new one (if any)
-			if [ -d "$TERMUX_DATA_CURRENT_BACKUPDIR" ]; then
-				mv "$TERMUX_DATA_CURRENT_BACKUPDIR" /data/data
-			fi
-		fi
-	fi
-
-	# Keep track of current arch we are building for.
-	echo "$TERMUX_ARCH" > $TERMUX_ARCH_FILE
-}
+source scripts/build/termux_step_handle_buildarch.sh
 
 # Function to get TERMUX_PKG_VERSION from build.sh
 source scripts/termux_extract_dep_info.sh
diff --git a/scripts/build/termux_step_handle_buildarch.sh b/scripts/build/termux_step_handle_buildarch.sh
new file mode 100644
index 000000000..bd5ab2c3d
--- /dev/null
+++ b/scripts/build/termux_step_handle_buildarch.sh
@@ -0,0 +1,28 @@
+termux_step_handle_buildarch() {
+	# If $TERMUX_PREFIX already exists, it may have been built for a different arch
+	local TERMUX_ARCH_FILE=/data/TERMUX_ARCH
+	if [ -f "${TERMUX_ARCH_FILE}" ]; then
+		local TERMUX_PREVIOUS_ARCH
+		TERMUX_PREVIOUS_ARCH=$(cat $TERMUX_ARCH_FILE)
+		if [ "$TERMUX_PREVIOUS_ARCH" != "$TERMUX_ARCH" ]; then
+			local TERMUX_DATA_BACKUPDIRS=$TERMUX_TOPDIR/_databackups
+			mkdir -p "$TERMUX_DATA_BACKUPDIRS"
+			local TERMUX_DATA_PREVIOUS_BACKUPDIR=$TERMUX_DATA_BACKUPDIRS/$TERMUX_PREVIOUS_ARCH
+			local TERMUX_DATA_CURRENT_BACKUPDIR=$TERMUX_DATA_BACKUPDIRS/$TERMUX_ARCH
+			# Save current /data (removing old backup if any)
+			if test -e "$TERMUX_DATA_PREVIOUS_BACKUPDIR"; then
+				termux_error_exit "Directory already exists"
+			fi
+			if [ -d /data/data ]; then
+				mv /data/data "$TERMUX_DATA_PREVIOUS_BACKUPDIR"
+			fi
+			# Restore new one (if any)
+			if [ -d "$TERMUX_DATA_CURRENT_BACKUPDIR" ]; then
+				mv "$TERMUX_DATA_CURRENT_BACKUPDIR" /data/data
+			fi
+		fi
+	fi
+
+	# Keep track of current arch we are building for.
+	echo "$TERMUX_ARCH" > $TERMUX_ARCH_FILE
+}