From 3f0a61c2f0ff1f69a88b22605a5d66e8acb1542b Mon Sep 17 00:00:00 2001 From: Ivan Max <60917834+Maxython@users.noreply.github.com> Date: Sat, 25 Sep 2021 11:19:59 +0300 Subject: [PATCH] build-package.sh: pacman format: transform package version containing letters (#7597) Example: 1.0.0a --> 1.0.0.a --- scripts/build/termux_create_pacman_subpackages.sh | 2 ++ scripts/build/termux_step_create_pacman_package.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/scripts/build/termux_create_pacman_subpackages.sh b/scripts/build/termux_create_pacman_subpackages.sh index 682825b8a..3037613cf 100644 --- a/scripts/build/termux_create_pacman_subpackages.sh +++ b/scripts/build/termux_create_pacman_subpackages.sh @@ -66,7 +66,9 @@ termux_create_pacman_subpackages() { TERMUX_SUBPKG_DEPENDS+=", $TERMUX_PKG_DEPENDS" fi + # Version view revisions. local TERMUX_PKG_VERSION=$(echo $TERMUX_PKG_VERSION | sed "s|-|.|") + local TERMUX_PKG_VERSION=${TERMUX_PKG_VERSION/[a-z]/.${TERMUX_PKG_VERSION//[0-9.]/}} # Package metadata. { diff --git a/scripts/build/termux_step_create_pacman_package.sh b/scripts/build/termux_step_create_pacman_package.sh index d008f1b31..6288de676 100644 --- a/scripts/build/termux_step_create_pacman_package.sh +++ b/scripts/build/termux_step_create_pacman_package.sh @@ -37,7 +37,9 @@ termux_step_create_pacman_package() { local PACMAN_FILE=$TERMUX_OUTPUT_DIR/${TERMUX_PKG_NAME}${DEBUG}-${TERMUX_PKG_FULLVERSION}-${TERMUX_ARCH}.pkg.tar.${PKG_FORMAT} + # Version view revisions. local TERMUX_PKG_VERSION=$(echo $TERMUX_PKG_VERSION | sed "s|-|.|") + local TERMUX_PKG_VERSION=${TERMUX_PKG_VERSION/[a-z]/.${TERMUX_PKG_VERSION//[0-9.]/}} local BUILD_DATE BUILD_DATE=$(date +%s)