sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build-package.sh: correct version info for pacman package format (#7605)

Browse Source
This commit is contained in:
Ivan Max 2021-09-27 12:02:40 +03:00 committed by GitHub
parent 4e004839a3
commit a522f80f0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/build/termux_create_pacman_subpackages.sh
View File

@ -69,16 +69,18 @@ termux_create_pacman_subpackages() {
# Version view revisions. # Version view revisions.
local TERMUX_PKG_VERSION=$(echo $TERMUX_PKG_VERSION | sed "s|-|.|") 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 TERMUX_PKG_VERSION=${TERMUX_PKG_VERSION/[a-z]/.${TERMUX_PKG_VERSION//[0-9.]/}}
local TERMUX_PKG_FULLVERSION="${TERMUX_PKG_VERSION}"
if [ -n "$TERMUX_PKG_REVISION" ]; then
TERMUX_PKG_FULLVERSION+="-${TERMUX_PKG_REVISION}"
else
TERMUX_PKG_FULLVERSION+="-0"
fi
# Package metadata. # Package metadata.
{ {
echo "pkgname = $SUB_PKG_NAME" echo "pkgname = $SUB_PKG_NAME"
echo "pkgbase = $TERMUX_PKG_NAME" echo "pkgbase = $TERMUX_PKG_NAME"
if [ -n "$TERMUX_PKG_REVISION" ]; then echo "pkgver = $TERMUX_PKG_FULLVERSION"
echo "pkgver = $TERMUX_PKG_VERSION-${TERMUX_PKG_REVISION}"
else
echo "pkgver = $TERMUX_PKG_VERSION-0"
fi
echo "pkgdesc = $(echo "$TERMUX_SUBPKG_DESCRIPTION" | tr '\n' ' ')" echo "pkgdesc = $(echo "$TERMUX_SUBPKG_DESCRIPTION" | tr '\n' ' ')"
echo "url = $TERMUX_PKG_HOMEPAGE" echo "url = $TERMUX_PKG_HOMEPAGE"
echo "builddate = $BUILD_DATE" echo "builddate = $BUILD_DATE"
@ -112,11 +114,7 @@ termux_create_pacman_subpackages() {
echo "format = 2" echo "format = 2"
echo "pkgname = $SUB_PKG_NAME" echo "pkgname = $SUB_PKG_NAME"
echo "pkgbase = $TERMUX_PKG_NAME" echo "pkgbase = $TERMUX_PKG_NAME"
if [ -n "$TERMUX_PKG_REVISION" ]; then echo "pkgver = $TERMUX_PKG_FULLVERSION"
echo "pkgver = $TERMUX_PKG_VERSION-${TERMUX_PKG_REVISION}"
else
echo "pkgver = $TERMUX_PKG_VERSION-0"
fi
echo "pkgarch = $SUB_PKG_ARCH" echo "pkgarch = $SUB_PKG_ARCH"
echo "packager = $TERMUX_PKG_MAINTAINER" echo "packager = $TERMUX_PKG_MAINTAINER"
echo "builddate = $BUILD_DATE" echo "builddate = $BUILD_DATE"

22
scripts/build/termux_step_create_pacman_package.sh
View File

@ -35,11 +35,17 @@ termux_step_create_pacman_package() {
PKG_FORMAT="xz";; PKG_FORMAT="xz";;
esac esac
local PACMAN_FILE=$TERMUX_OUTPUT_DIR/${TERMUX_PKG_NAME}${DEBUG}-${TERMUX_PKG_FULLVERSION}-${TERMUX_ARCH}.pkg.tar.${PKG_FORMAT}
# Version view revisions. # Version view revisions.
local TERMUX_PKG_VERSION=$(echo $TERMUX_PKG_VERSION | sed "s|-|.|") 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 TERMUX_PKG_VERSION=${TERMUX_PKG_VERSION/[a-z]/.${TERMUX_PKG_VERSION//[0-9.]/}}
local TERMUX_PKG_FULLVERSION="${TERMUX_PKG_VERSION}"
if [ -n "$TERMUX_PKG_REVISION" ]; then
TERMUX_PKG_FULLVERSION+="-${TERMUX_PKG_REVISION}"
else
TERMUX_PKG_FULLVERSION+="-0"
fi
local PACMAN_FILE=$TERMUX_OUTPUT_DIR/${TERMUX_PKG_NAME}${DEBUG}-${TERMUX_PKG_FULLVERSION}-${TERMUX_ARCH}.pkg.tar.${PKG_FORMAT}
local BUILD_DATE local BUILD_DATE
BUILD_DATE=$(date +%s) BUILD_DATE=$(date +%s)
@ -48,11 +54,7 @@ termux_step_create_pacman_package() {
{ {
echo "pkgname = $TERMUX_PKG_NAME" echo "pkgname = $TERMUX_PKG_NAME"
echo "pkgbase = $TERMUX_PKG_NAME" echo "pkgbase = $TERMUX_PKG_NAME"
if [ -n "$TERMUX_PKG_REVISION" ]; then echo "pkgver = $TERMUX_PKG_FULLVERSION"
echo "pkgver = $TERMUX_PKG_VERSION-${TERMUX_PKG_REVISION}"
else
echo "pkgver = $TERMUX_PKG_VERSION-0"
fi
echo "pkgdesc = $(echo "$TERMUX_PKG_DESCRIPTION" | tr '\n' ' ')" echo "pkgdesc = $(echo "$TERMUX_PKG_DESCRIPTION" | tr '\n' ' ')"
echo "url = $TERMUX_PKG_HOMEPAGE" echo "url = $TERMUX_PKG_HOMEPAGE"
echo "builddate = $BUILD_DATE" echo "builddate = $BUILD_DATE"
@ -106,11 +108,7 @@ termux_step_create_pacman_package() {
echo "format = 2" echo "format = 2"
echo "pkgname = $TERMUX_PKG_NAME" echo "pkgname = $TERMUX_PKG_NAME"
echo "pkgbase = $TERMUX_PKG_NAME" echo "pkgbase = $TERMUX_PKG_NAME"
if [ -n "$TERMUX_PKG_REVISION" ]; then echo "pkgver = $TERMUX_PKG_FULLVERSION"
echo "pkgver = $TERMUX_PKG_VERSION-${TERMUX_PKG_REVISION}"
else
echo "pkgver = $TERMUX_PKG_VERSION-0"
fi
echo "pkgarch = $TERMUX_ARCH" echo "pkgarch = $TERMUX_ARCH"
echo "packager = $TERMUX_PKG_MAINTAINER" echo "packager = $TERMUX_PKG_MAINTAINER"
echo "builddate = $BUILD_DATE" echo "builddate = $BUILD_DATE"