From 3c35c92fdedcef0d23cdd15b69b8d1e431fc72e7 Mon Sep 17 00:00:00 2001 From: Lucy Phipps Date: Sun, 3 Sep 2023 11:19:09 +0100 Subject: [PATCH] build-package.sh: simpler TERMUX_REPO_PKG_FORMAT default --- build-package.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/build-package.sh b/build-package.sh index d5d5b102ec..35c71cb1a0 100755 --- a/build-package.sh +++ b/build-package.sh @@ -58,11 +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) -if [ "$TERMUX_REPO_PKG_FORMAT" = "null" ]; then - export TERMUX_REPO_PKG_FORMAT="debian" -fi - +export TERMUX_REPO_PKG_FORMAT=$(jq --raw-output '.pkg_format // "debian"' ${TERMUX_SCRIPTDIR}/repo.json) # Special variable for internal use. It forces script to ignore # lock file.