parse repo.json in build-package.sh instead of properties.sh

This commit is contained in:
Lucy Phipps 2023-09-03 09:23:17 +01:00
parent 5ed8471923
commit 4755014aa5
No known key found for this signature in database
GPG Key ID: 8F688A3DB7869BFE
2 changed files with 1 additions and 6 deletions

View File

@ -58,6 +58,7 @@ if [ ! -e "$TERMUX_BUILD_LOCK_FILE" ]; then
fi
export TERMUX_PACKAGES_DIRECTORIES=$(jq --raw-output 'del(.pkg_format) | keys | .[]' ${TERMUX_SCRIPTDIR}/repo.json)
export TERMUX_REPO_PKG_FORMAT=$(jq --raw-output '.pkg_format' ${TERMUX_SCRIPTDIR}/repo.json)
# Special variable for internal use. It forces script to ignore
# lock file.

View File

@ -46,12 +46,6 @@ export CGCT_DIR="/data/data/${TERMUX_APP_PACKAGE}/cgct"
# has packages that were built with same package name.
TERMUX_REPO_PACKAGE="com.termux"
# Getting the format of packages in repos
TERMUX_REPO_PKG_FORMAT=$(jq -r '.pkg_format' ${TERMUX_SCRIPTDIR}/repo.json)
if [ "$TERMUX_REPO_PKG_FORMAT" = "null" ]; then
TERMUX_REPO_PKG_FORMAT="debian"
fi
# Termux repo urls.
TERMUX_REPO_URL=()
TERMUX_REPO_DISTRIBUTION=()