From 3a5bec4098fb7a75a5bf8a10ff2382e67718ecc1 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sat, 29 Dec 2018 11:56:40 +0100 Subject: [PATCH] build-package: add termux_extract_version function --- build-package.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/build-package.sh b/build-package.sh index 978d88c6d..f726c4753 100755 --- a/build-package.sh +++ b/build-package.sh @@ -426,6 +426,15 @@ termux_step_handle_buildarch() { echo "$TERMUX_ARCH" > $TERMUX_ARCH_FILE } +# Function to get TERMUX_PKG_VERSION from build.sh +termux_extract_version() { + package=$1 + ( + source $package/build.sh + echo $TERMUX_PKG_VERSION-$TERMUX_PKG_REVISION + ) +} + # Source the package build script and start building. No to be overridden by packages. termux_step_start_build() { # shellcheck source=/dev/null @@ -471,11 +480,8 @@ termux_step_start_build() { TERMUX_ALL_DEPS=$(./scripts/buildorder.py "$TERMUX_PKG_BUILDER_DIR") for p in $TERMUX_ALL_DEPS; do echo "Downloading dependency $(basename $p) if necessary..." - # termux_get_deb $TERMUX_ARCH "$p" - local p_ver=$(termux_extract_version "$p") - echo "hej" - echo "$p_ver" - echo "håå" + local dep_version=$(termux_extract_version "$p") + termux_get_deb $TERMUX_ARCH "$p" done fi