这是indexloc提供的服务，不要输入任何密码
Skip to content

Auto updates: add support for source arrays. #23678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Auto updates: add support for source arrays. #23678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6b7b33
bump(main/manpages): 6.13
TomJo2000 Mar 8, 2025
952ba49
[WIP] chore(scripts/update-checksums): enable support for arrays
TomJo2000 May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 30 additions & 4 deletions packages/manpages/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.kernel.org/doc/man-pages/
TERMUX_PKG_DESCRIPTION="Man pages for linux kernel and C library interfaces"
TERMUX_PKG_LICENSE="custom"
TERMUX_PKG_LICENSE_FILE="LICENSES/Linux-man-pages-copyleft.txt, _man-pages-posix/POSIX-COPYRIGHT"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(6.13
2017)
TERMUX_PKG_MAINTAINER="Joshua Kahn @TomJo2000"
TERMUX_PKG_VERSION=(6.12 # Kernel man pages
2017) # POSIX man pages
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=(
a2c8a0c2efe8a978ce51ce800461eb9e8931f12cc7ba4b7faa3082b69ba7f12c
Expand All @@ -19,6 +19,10 @@ TERMUX_PKG_PROVIDES="linux-man-pages"
TERMUX_PKG_EXTRA_MAKE_ARGS="-R prefix=$TERMUX_PREFIX VERSION=$TERMUX_PKG_VERSION"
TERMUX_PKG_PLATFORM_INDEPENDENT=true
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_AUTO_UPDATE=true
# Man pages are only usually updated for new Kernel releases, not patch releases.
TERMUX_PKG_UPDATE_VERSION_REGEXP='\d+\.\d+'


# Do not remove an entire section; intro should always be included.
# Bionic libc does not provide <aio.h>, <monetary.h> or pthread_cancel.
Expand All @@ -42,8 +46,30 @@ share/man/man7/man.7
share/man/man7/mdoc.7
"

termux_pkg_auto_update() {
local latest_kernel_major
latest_kernel_major="$(git ls-remote --tags https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git \
| grep -oP "refs/tags/v\K${TERMUX_PKG_UPDATE_VERSION_REGEXP}$" \
| sort -V \
| tail -n1)"

# No new major release.
if [[ "${latest_kernel_major}" == "${TERMUX_PKG_VERSION[0]}" ]]; then
echo "INFO: No update needed. Already at version '${TERMUX_PKG_VERSION[0]}'."
return
fi

# Verify that this major updated the man pages
curl -fsSL "https://www.kernel.org/pub/linux/docs/man-pages/man-pages-${latest_kernel_major}.tar.sign" &> /dev/null || {
echo "Info: Not updating. Linux ${latest_kernel_major} doesn't seem to have updates the man pages."
}

termux_pkg_upgrade_version "${latest_kernel_major}"
Comment on lines +50 to +67
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
local latest_kernel_major
latest_kernel_major="$(git ls-remote --tags https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git \
| grep -oP "refs/tags/v\K${TERMUX_PKG_UPDATE_VERSION_REGEXP}$" \
| sort -V \
| tail -n1)"
# No new major release.
if [[ "${latest_kernel_major}" == "${TERMUX_PKG_VERSION[0]}" ]]; then
echo "INFO: No update needed. Already at version '${TERMUX_PKG_VERSION[0]}'."
return
fi
# Verify that this major updated the man pages
curl -fsSL "https://www.kernel.org/pub/linux/docs/man-pages/man-pages-${latest_kernel_major}.tar.sign" &> /dev/null || {
echo "Info: Not updating. Linux ${latest_kernel_major} doesn't seem to have updates the man pages."
}
termux_pkg_upgrade_version "${latest_kernel_major}"
# get the page, find all filenames, sort by version and get the last line
local latest="$(curl -s https://www.kernel.org/pub/linux/docs/man-pages/ \
| grep -oP 'man-pages-\K[0-9]+(\.[0-9]+)*' \
| sort -V -u \
| tail -n1)"
termux_pkg_upgrade_version "${latest}"

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Heh.

Suggested change
local latest_kernel_major
latest_kernel_major="$(git ls-remote --tags https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git \
| grep -oP "refs/tags/v\K${TERMUX_PKG_UPDATE_VERSION_REGEXP}$" \
| sort -V \
| tail -n1)"
# No new major release.
if [[ "${latest_kernel_major}" == "${TERMUX_PKG_VERSION[0]}" ]]; then
echo "INFO: No update needed. Already at version '${TERMUX_PKG_VERSION[0]}'."
return
fi
# Verify that this major updated the man pages
curl -fsSL "https://www.kernel.org/pub/linux/docs/man-pages/man-pages-${latest_kernel_major}.tar.sign" &> /dev/null || {
echo "Info: Not updating. Linux ${latest_kernel_major} doesn't seem to have updates the man pages."
}
termux_pkg_upgrade_version "${latest_kernel_major}"
read -r latest < <(curl -fsSL https://www.kernel.org/pub/linux/docs/man-pages/ | sed -rn 's/.*man-pages-([0-9]+(\.[0-9]+)*).*/\1/p' | sort -Vr);
termux_pkg_upgrade_version "${latest}"

}


termux_step_post_get_source() {
mv man-pages-posix-${TERMUX_PKG_VERSION[1]} _man-pages-posix
mv "man-pages-posix-${TERMUX_PKG_VERSION[1]}" _man-pages-posix
}

termux_step_make() {
Expand Down
57 changes: 41 additions & 16 deletions scripts/bin/update-checksum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,27 +54,52 @@ for package in "${@}"; do
continue
fi

# Command substitution create a subshell, we want to do this
# to not effect the main scope's variables by sourcing the build script
new_checksum=($(
source "${buildsh_path}" 2>/dev/null
for url in "${TERMUX_PKG_SRCURL[@]}"; do
echo "Downloading ${url}" >&2
dl_tmpdir=$(mktemp -d "${TMPDIR-/tmp}/termux.src.dl.XXXXXXXX")
(
function get_sha256() {
local dl_tmpdir
for url in "$@"; do
echo "Downloading ${url}" >&2
dl_tmpdir="$(mktemp -d "${TMPDIR-/tmp}/termux.src.dl.XXXXXXXX")"

if [[ -d "${dl_tmpdir}" ]]; then
if ! curl --fail --location --retry 3 --output "${dl_tmpdir}/source-bundle" "$url"; then
rm -rf "${dl_tmpdir}"
fi

if [[ -f "${dl_tmpdir}/source-bundle" ]]; then
sha256sum "${dl_tmpdir}/source-bundle" | awk '{ print $1 }'
fi

if [[ -d "${dl_tmpdir}" ]]; then
if ! curl --fail --location --retry 3 --output "${dl_tmpdir}/source-bundle" "$url"; then
rm -rf "${dl_tmpdir}"
fi
Comment on lines +62 to 74
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
dl_tmpdir="$(mktemp -d "${TMPDIR-/tmp}/termux.src.dl.XXXXXXXX")"
if [[ -d "${dl_tmpdir}" ]]; then
if ! curl --fail --location --retry 3 --output "${dl_tmpdir}/source-bundle" "$url"; then
rm -rf "${dl_tmpdir}"
fi
if [[ -f "${dl_tmpdir}/source-bundle" ]]; then
sha256sum "${dl_tmpdir}/source-bundle" | awk '{ print $1 }'
fi
if [[ -d "${dl_tmpdir}" ]]; then
if ! curl --fail --location --retry 3 --output "${dl_tmpdir}/source-bundle" "$url"; then
rm -rf "${dl_tmpdir}"
fi
curl --fail --location --retry 3 --output - "$url" | sha256sum | awk '{ print $1 }'
if (( PIPESTATUS[0] )); then
echo "ERROR: Download failed, can not proceed." >&2
exit 1
fi

done
}

if [[ -f "${dl_tmpdir}/source-bundle" ]]; then
sha256sum "${dl_tmpdir}/source-bundle" | awk '{ print $1 }'
fi
# shellcheck source=/dev/null
source "${buildsh_path}" 2>/dev/null
source "$REPO_ROOT/scripts/updates/utils/termux_pkg_patch_value.sh"

rm -rf "${dl_tmpdir}"
fi
done
))
old_checksum=''
new_checksum=''
case "${TERMUX_PKG_SRCURL@a}" in
'a') {
for (( i = 0; i < ${#TERMUX_PKG_SRCURL[*]}; i++ )); do
old_checksum="${TERMUX_PKG_SHA256[$i]}"
new_checksum="$(get_sha256 "${TERMUX_PKG_SRCURL[$i]}")"
termux_pkg_patch_value 'TERMUX_PKG_SHA256' \
"$old_checksum" "$new_checksum" "$buildsh_path"
done
} > "${TMPDIR-/tmp}/${package}.auto.patch"
;;
'') {
old_checksum="${TERMUX_PKG_SHA256}"
new_checksum="$(get_sha256 "${TERMUX_PKG_SRCURL}")"
termux_pkg_patch_value 'TERMUX_PKG_SHA256' \
"$old_checksum" "$new_checksum" "$buildsh_path"
} > "${TMPDIR-/tmp}/${package}.auto.patch"
;;
esac
)

if (( ${#new_checksum[@]} )); then
# Replace old SHA-256.
Expand Down
28 changes: 28 additions & 0 deletions scripts/updates/utils/termux_pkg_patch_value.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#!/bin/false
# This script should be sourced, not run standalone.

# shellcheck shell=bash
# $1 - What variable are we patching?
# $2 - Old value to replace
# $3 - New value to substitute
# $4 - File to patch
termux_pkg_patch_value() {
local target_value="$1"
local old_value="$2"
local new_value="$3"
local file_path="$4"

local regex
case "$target_value" in
'TERMUX_PKG_VERSION') regex='(?m)^\s*TERMUX_PKG_VERSION[^=]*=(?:[^\(\n]*$|\((?:[^\)]*\))+?(?=\s*#|$))';;
'TERMUX_PKG_SHA256') regex='(?m)^\s*TERMUX_PKG_SHA256[^=]*=(?:[^\(\n]*$|\((?:[^\)]*\))+?(?=\s*#|$))';;
*) return 1;;
esac

local match
match="$(grep -bzoP "${regex}" "${file_path}")"
git -P diff --ignore-space-at-eol --text --no-index \
<(tail -c+$(( ${match%:*} + 1 )) "${file_path}" | head -c${#match#*:}) \
<(sed -e "s/${old_value}/${new_value}/;s/\x0//" <<< "${match#*:}") \
| sed -e "s@proc/self/fd/[0-9]*@${file_path}@g"
}
4 changes: 2 additions & 2 deletions scripts/updates/utils/termux_pkg_upgrade_version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ termux_pkg_upgrade_version() {

echo "INFO: package being updated to ${LATEST_VERSION}."

sed \
-e "s/^\(TERMUX_PKG_VERSION=\)\(.*\)\$/\1\"${EPOCH}${LATEST_VERSION}\"/g" \
sed -r \
-e "s/^(TERMUX_PKG_VERSION=\(?)(.*)\$/\1\"${EPOCH}${LATEST_VERSION}\"/g" \
-e "/TERMUX_PKG_REVISION=/d" \
-i "${TERMUX_PKG_BUILDER_DIR}/build.sh"
Comment on lines +87 to 90
Copy link
Member

@twaik twaik Apr 29, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably I found it out, but it is a literal nightmare.

Suggested change
sed -r \
-e "s/^(TERMUX_PKG_VERSION=\(?)(.*)\$/\1\"${EPOCH}${LATEST_VERSION}\"/g" \
-e "/TERMUX_PKG_REVISION=/d" \
-i "${TERMUX_PKG_BUILDER_DIR}/build.sh"
sed -z -r \
-e "s/(TERMUX_PKG_VERSION=\(?[[:space:]]*)[^[:space:]\)]+/\1\"${EPOCH}${LATEST_VERSION}\"/" \
-e "s/(^|\n)TERMUX_PKG_REVISION=[^\n]*(\n|$)/\1/" \
-i "${TERMUX_PKG_BUILDER_DIR}/build.sh"

Or it you think perl is better

perl -0777 -i -pe '
  s/^TERMUX_PKG_REVISION=.*\n//mg;
  s{(TERMUX_PKG_VERSION=\(?\s*)[^)\s]+}{
     qq{$1"'"${EPOCH}${LATEST_VERSION}"'"}
  }em
' "${TERMUX_PKG_BUILDER_DIR}/build.sh"
tests.sh

Not my best work but it did the job.

#!/bin/bash
temp_dir=$(mktemp -d) || { echo failed to create temp directory; exit 1; }

cd "${temp_dir}"

LATEST_VERSION=6.18
EPOCH01=
cat << EOF > build.sh.01
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(6.13
                    2017)
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=(
EOF

cat << EOF > expected.build.sh.01
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=("6.18"
                    2017)
TERMUX_PKG_SHA256=(
EOF

EPOCH02=
cat << EOF > build.sh.02
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(6.13 2017)
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=(
EOF

cat << EOF > expected.build.sh.02
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=("6.18" 2017)
TERMUX_PKG_SHA256=(
EOF

EPOCH03=
cat << EOF > build.sh.03
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
6.13
2017
)
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=(
EOF

cat << EOF > expected.build.sh.03
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
"6.18"
2017
)
TERMUX_PKG_SHA256=(
EOF

EPOCH04=
cat << EOF > build.sh.04
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
		6.13
        2017
)
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=(
EOF

cat << EOF > expected.build.sh.04
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
		"6.18"
        2017
)
TERMUX_PKG_SHA256=(
EOF

EPOCH05=
cat << EOF > build.sh.05
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
6.13 2017
)
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=(
EOF

cat << EOF > expected.build.sh.05
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
"6.18" 2017
)
TERMUX_PKG_SHA256=(
EOF

EPOCH06=
cat << EOF > build.sh.06
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
6.13 2017)
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=(
EOF

cat << EOF > expected.build.sh.06
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
"6.18" 2017)
TERMUX_PKG_SHA256=(
EOF

EPOCH07=
cat << EOF > build.sh.07
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
"6.13" 2017)
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=(
EOF

cat << EOF > expected.build.sh.07
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
"6.18" 2017)
TERMUX_PKG_SHA256=(
EOF

EPOCH08=3:
cat << EOF > build.sh.08
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
3:6.13 2017)
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=(
EOF

cat << EOF > expected.build.sh.08
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
"3:6.18" 2017)
TERMUX_PKG_SHA256=(
EOF

EPOCH09=3:
cat << EOF > build.sh.09
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
						3:6.13 2017)
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=(
EOF

cat << EOF > expected.build.sh.09
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
						"3:6.18" 2017)
TERMUX_PKG_SHA256=(
EOF

EPOCH10=3:
cat << EOF > build.sh.10
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
						3:6.13 2017
	)
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=(
EOF

cat << EOF > expected.build.sh.10
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
						"3:6.18" 2017
	)
TERMUX_PKG_SHA256=(
EOF

EPOCH11=3:
cat << EOF > build.sh.11
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
						"3:6.13" 2017
	)
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=(
EOF

cat << EOF > expected.build.sh.11
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
						"3:6.18" 2017
	)
TERMUX_PKG_SHA256=(
EOF

EPOCH12=3:
cat << EOF > build.sh.12
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="3:6.13"
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=(
EOF

cat << EOF > expected.build.sh.12
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="3:6.18"
TERMUX_PKG_SHA256=(
EOF

EPOCH13=3:
cat << EOF > build.sh.13
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=3:6.13
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=(
EOF

cat << EOF > expected.build.sh.13
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="3:6.18"
TERMUX_PKG_SHA256=(
EOF

for i in build.sh.*; do
var="EPOCH${i##*.}"
EPOCH="${!var}"

false && \
perl -0777 -i -pe '
  s/^TERMUX_PKG_REVISION=.*\n//mg;
  s{(TERMUX_PKG_VERSION=\(?\s*)[^)\s]+}{
     qq{$1"'"${EPOCH}${LATEST_VERSION}"'"}
  }em
' "$i"

sed -z -r -i \
  -e "s/(TERMUX_PKG_VERSION=\(?[[:space:]]*)[^[:space:]\)]+/\1\"${EPOCH}${LATEST_VERSION}\"/" \
  -e "s/(^|\n)TERMUX_PKG_REVISION=[^\n]*(\n|$)/\1/" \
  "$i"

if diff -Naur "$i" "expected.$i"; then
	echo "test ${i##*.} passed"
else
	echo "test ${i##*.} failed"
fi
done

cd - &>-
rm -rf "${temp_dir}"

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But I did not test the sed and perl commands on real buildscripts, only in this synthetic test.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably I found it out, but it is a literal nightmare.

Suggested change
sed -r \
-e "s/^(TERMUX_PKG_VERSION=\(?)(.*)\$/\1\"${EPOCH}${LATEST_VERSION}\"/g" \
-e "/TERMUX_PKG_REVISION=/d" \
-i "${TERMUX_PKG_BUILDER_DIR}/build.sh"
sed -z -r \
-e "s/(TERMUX_PKG_VERSION=\(?[[:space:]]*)[^[:space:]\)]+/\1\"${EPOCH}${LATEST_VERSION}\"/" \
-e "s/(^|\n)TERMUX_PKG_REVISION=[^\n]*(\n|$)/\1/" \
-i "${TERMUX_PKG_BUILDER_DIR}/build.sh"

Or it you think perl is better

perl -0777 -i -pe '
  s/^TERMUX_PKG_REVISION=.*\n//mg;
  s{(TERMUX_PKG_VERSION=\(?\s*)[^)\s]+}{
     qq{$1"'"${EPOCH}${LATEST_VERSION}"'"}
  }em
' "${TERMUX_PKG_BUILDER_DIR}/build.sh"
tests.sh

Not my best work but it did the job.

#!/bin/bash
temp_dir=$(mktemp -d) || { echo failed to create temp directory; exit 1; }

cd "${temp_dir}"

LATEST_VERSION=6.18
EPOCH01=
cat << EOF > build.sh.01
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(6.13
                    2017)
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=(
EOF

cat << EOF > expected.build.sh.01
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=("6.18"
                    2017)
TERMUX_PKG_SHA256=(
EOF

EPOCH02=
cat << EOF > build.sh.02
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(6.13 2017)
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=(
EOF

cat << EOF > expected.build.sh.02
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=("6.18" 2017)
TERMUX_PKG_SHA256=(
EOF

EPOCH03=
cat << EOF > build.sh.03
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
6.13
2017
)
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=(
EOF

cat << EOF > expected.build.sh.03
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
"6.18"
2017
)
TERMUX_PKG_SHA256=(
EOF

EPOCH04=
cat << EOF > build.sh.04
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
		6.13
        2017
)
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=(
EOF

cat << EOF > expected.build.sh.04
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
		"6.18"
        2017
)
TERMUX_PKG_SHA256=(
EOF

EPOCH05=
cat << EOF > build.sh.05
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
6.13 2017
)
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=(
EOF

cat << EOF > expected.build.sh.05
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
"6.18" 2017
)
TERMUX_PKG_SHA256=(
EOF

EPOCH06=
cat << EOF > build.sh.06
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
6.13 2017)
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=(
EOF

cat << EOF > expected.build.sh.06
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
"6.18" 2017)
TERMUX_PKG_SHA256=(
EOF

EPOCH07=
cat << EOF > build.sh.07
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
"6.13" 2017)
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=(
EOF

cat << EOF > expected.build.sh.07
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
"6.18" 2017)
TERMUX_PKG_SHA256=(
EOF

EPOCH08=3:
cat << EOF > build.sh.08
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
3:6.13 2017)
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=(
EOF

cat << EOF > expected.build.sh.08
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
"3:6.18" 2017)
TERMUX_PKG_SHA256=(
EOF

EPOCH09=3:
cat << EOF > build.sh.09
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
						3:6.13 2017)
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=(
EOF

cat << EOF > expected.build.sh.09
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
						"3:6.18" 2017)
TERMUX_PKG_SHA256=(
EOF

EPOCH10=3:
cat << EOF > build.sh.10
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
						3:6.13 2017
	)
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=(
EOF

cat << EOF > expected.build.sh.10
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
						"3:6.18" 2017
	)
TERMUX_PKG_SHA256=(
EOF

EPOCH11=3:
cat << EOF > build.sh.11
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
						"3:6.13" 2017
	)
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=(
EOF

cat << EOF > expected.build.sh.11
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=(
						"3:6.18" 2017
	)
TERMUX_PKG_SHA256=(
EOF

EPOCH12=3:
cat << EOF > build.sh.12
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="3:6.13"
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=(
EOF

cat << EOF > expected.build.sh.12
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="3:6.18"
TERMUX_PKG_SHA256=(
EOF

EPOCH13=3:
cat << EOF > build.sh.13
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=3:6.13
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=(
EOF

cat << EOF > expected.build.sh.13
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="3:6.18"
TERMUX_PKG_SHA256=(
EOF

for i in build.sh.*; do
var="EPOCH${i##*.}"
EPOCH="${!var}"

false && \
perl -0777 -i -pe '
  s/^TERMUX_PKG_REVISION=.*\n//mg;
  s{(TERMUX_PKG_VERSION=\(?\s*)[^)\s]+}{
     qq{$1"'"${EPOCH}${LATEST_VERSION}"'"}
  }em
' "$i"

sed -z -r -i \
  -e "s/(TERMUX_PKG_VERSION=\(?[[:space:]]*)[^[:space:]\)]+/\1\"${EPOCH}${LATEST_VERSION}\"/" \
  -e "s/(^|\n)TERMUX_PKG_REVISION=[^\n]*(\n|$)/\1/" \
  "$i"

if diff -Naur "$i" "expected.$i"; then
	echo "test ${i##.*} passed"
else
	echo "test ${i##.*} failed"
fi
done

cd - &>-
rm -rf "${temp_dir}"

As Apollo pointed out in the other PR.
I'd like to avoid adding perl as an additional dependency to our build scripts.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case you can test the sed solution. Or I can try it when I get home.

Also as Robert mentioned perl is a dependency of at least autoconf autogen automake build-essential gobject-introspection gobject-introspection-bin git which are extensively used in our buildscripts so I hardly believe it will not be present on build host.
#24518 (comment)

Copy link
Member

@twaik twaik Apr 29, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sooooo
I found all packages like manpages with

$ grep -nr TERMUX_PKG_VERSION= --include=build.sh . | grep -v -E -e '="' -e '=[0-9]+' -e '=\$' 
./packages/maxima/build.sh:5:TERMUX_PKG_VERSION=()
./packages/ncurses/build.sh:15:TERMUX_PKG_VERSION=(6.5.20240831
./packages/glulxe/build.sh:5:TERMUX_PKG_VERSION=(0.6.1
./packages/libandroid-support/build.sh:4:TERMUX_PKG_VERSION=(29
./packages/softether-vpn/build.sh:5:TERMUX_PKG_VERSION=(5.02.5180)
./packages/unar/build.sh:5:TERMUX_PKG_VERSION=()
./packages/perl/build.sh:12:TERMUX_PKG_VERSION=(5.38.2
./packages/hilbish/build.sh:5:TERMUX_PKG_VERSION=(
./packages/manpages/build.sh:6:TERMUX_PKG_VERSION=(6.13
./packages/ldc/build.sh:5:TERMUX_PKG_VERSION=(1.30.0)
./sample/build.sh:9:TERMUX_PKG_VERSION=
./disabled-packages/mingw-w64-crt/build.sh:6:TERMUX_PKG_VERSION=(10.0.0)
./disabled-packages/mingw-w64-gcc-libs/build.sh:5:TERMUX_PKG_VERSION=(12.2.0)
./disabled-packages/libmusicbrainz/build.sh:5:TERMUX_PKG_VERSION=()
./x11-packages/tigervnc/build.sh:5:TERMUX_PKG_VERSION=(1.15.0
./root-packages/zmap/build.sh:5:TERMUX_PKG_VERSION=(1:4.3.2

So I checked ncurses, glulxe, libandroid-support, softether-vpn, perl, hilbish, ldc, tigervnc and zmap and it works there as well so I assume it works fine. And version replacing on regular packages was not broken.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually 13 lines of code since it removes revision separately.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the headache I guess...
I'll look into it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure why by update-checksums replaces all checksums in the checksums array so it is not the same case as in here. But there are a few things that can be refactored.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Twaik.
Can you get me done with one headache before adding another?
I'm looking at it. I'll hear more suggestions when I'm done with this one.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry.


Expand Down
Loading