From 3baa1a3a36bc606d9a525634eb14f71d47aec3ed Mon Sep 17 00:00:00 2001
From: Aditya Alok <dev.aditya.alok@gmail.com>
Date: Wed, 20 Apr 2022 23:31:54 +0530
Subject: [PATCH] refactor(auto update): replace `pkg_dir` with
 `TERMUX_PKG_BUILDER_DIR`

- this variable will store path of directory containing packages
  `build.sh` file.
- this is a more standard approach than specifying `pkg_dir` each time

Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
---
 packages/erlang/build.sh         | 2 +-
 packages/libmsgpack-cxx/build.sh | 2 +-
 packages/libmsgpack/build.sh     | 2 +-
 packages/neovim-nightly/build.sh | 2 +-
 scripts/bin/update-packages      | 2 ++
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/erlang/build.sh b/packages/erlang/build.sh
index 4a5633e6a..826b1511e 100644
--- a/packages/erlang/build.sh
+++ b/packages/erlang/build.sh
@@ -23,7 +23,7 @@ termux_pkg_auto_update() {
 	tag="$(termux_github_api_get_tag "${TERMUX_PKG_SRCURL}")"
 	# check if this is not an intermediate release candidate:
 	if grep -qP "^OTP-${TERMUX_PKG_UPDATE_VERSION_REGEXP}\$" <<<"$tag"; then
-		pkg_dir=$(dirname "$0") termux_pkg_upgrade_version "$tag"
+		termux_pkg_upgrade_version "$tag"
 	else
 		echo "WARNING: Skipping auto-update: Not stable release($tag)"
 	fi
diff --git a/packages/libmsgpack-cxx/build.sh b/packages/libmsgpack-cxx/build.sh
index 3db7f9e61..d88b60fe6 100644
--- a/packages/libmsgpack-cxx/build.sh
+++ b/packages/libmsgpack-cxx/build.sh
@@ -16,7 +16,7 @@ termux_pkg_auto_update() {
 	tag="$(termux_github_api_get_tag "${TERMUX_PKG_SRCURL}")"
 	# check if this is not a c release:
 	if grep -qP "^cpp-${TERMUX_PKG_UPDATE_VERSION_REGEXP}\$" <<<"$tag"; then
-		pkg_dir=$(dirname "$0") termux_pkg_upgrade_version "$tag"
+		termux_pkg_upgrade_version "$tag"
 	else
 		echo "WARNING: Skipping auto-update: Not a cpp release($tag)"
 	fi
diff --git a/packages/libmsgpack/build.sh b/packages/libmsgpack/build.sh
index 6bcb19522..3b294edba 100644
--- a/packages/libmsgpack/build.sh
+++ b/packages/libmsgpack/build.sh
@@ -21,7 +21,7 @@ termux_pkg_auto_update() {
 	tag="$(termux_github_api_get_tag "${TERMUX_PKG_SRCURL}")"
 	# check if this is not a c++ release:
 	if grep -qP "^c-${TERMUX_PKG_UPDATE_VERSION_REGEXP}\$" <<<"$tag"; then
-		pkg_dir=$(dirname "$0") termux_pkg_upgrade_version "$tag"
+		termux_pkg_upgrade_version "$tag"
 	else
 		echo "WARNING: Skipping auto-update: Not a C release($tag)"
 	fi
diff --git a/packages/neovim-nightly/build.sh b/packages/neovim-nightly/build.sh
index 3b4bd8ee1..607e7ec7b 100644
--- a/packages/neovim-nightly/build.sh
+++ b/packages/neovim-nightly/build.sh
@@ -63,7 +63,7 @@ termux_pkg_auto_update() {
 
 	# since we are using a nightly build, therefore no need to check for version increment/decrement.
 	if [ "${TERMUX_PKG_VERSION}" != "${remote_nvim_version}" ]; then
-		pkg_dir=$(dirname "$0") termux_pkg_upgrade_version "${remote_nvim_version}" --skip-version-check
+		termux_pkg_upgrade_version "${remote_nvim_version}" --skip-version-check
 	else
 		echo "INFO: No update available."
 	fi
diff --git a/scripts/bin/update-packages b/scripts/bin/update-packages
index 4f72f088d..a057874e1 100755
--- a/scripts/bin/update-packages
+++ b/scripts/bin/update-packages
@@ -74,6 +74,8 @@ TERMUX_SCRIPTDIR="$(realpath "$(dirname "$0")/../..")" # Script directory.
 _update() {
 	export TERMUX_PKG_NAME
 	TERMUX_PKG_NAME="$(basename "$1")"
+	export TERMUX_PKG_BUILDER_DIR
+	TERMUX_PKG_BUILDER_DIR="$(realpath "$1")" # Directory containing build.sh.
 	# Avoid:
 	# - ending on errors such as $(which prog), where prog is not installed.
 	# - error on unbound variable.