fabolous005/etools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix some bugs

Browse Source
This commit is contained in:
fabolous005 2024-09-29 20:05:03 +02:00
parent 8ed70faaaa
commit 1bd1c80a5a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etools
View File

@ -52,8 +52,8 @@ function etools_get_version() {
local latest=: local latest=:
. ./helper.sh . ./helper.sh
[ "$ETOOLS_CHECK_LIVE" ] && if _matches_live "$1"; then [ "$ETOOLS_CHECK_LIVE" ] && if _matches_live "$1"; then
latest="$(ls -1vr "${ETOOLS_REPO_PATH:-/var/db/repos}/*/$1/*9999*.ebuild" | head "-${2:-1}" 2>/dev/null)" latest="$(ls -1vr ${ETOOLS_REPO_PATH:-/var/db/repos}/*/$1/*9999*.ebuild | head "-${2:-1}" 2>/dev/null)"
[ -n "$latest" ] && _extract_version "$1" && ./helper.sh && return 0; [ -n "$latest" ] && _extract_version "$latest" && ./helper.sh && return 0;
fi fi
if [ "$ETOOLS_CHECK_TESTING" ]; then if [ "$ETOOLS_CHECK_TESTING" ]; then
. /etc/portage/make.conf . /etc/portage/make.conf
@ -65,12 +65,12 @@ function etools_get_version() {
if [[ "$ACCEPT_KEYWORDS" == *"~$arch"* ]] || _matches_testing "$1" "\~$arch"; then if [[ "$ACCEPT_KEYWORDS" == *"~$arch"* ]] || _matches_testing "$1" "\~$arch"; then
latest=$(_get_latest "$1" "${package_offset[$1]:-0}" "~$arch") latest=$(_get_latest "$1" "${package_offset[$1]:-0}" "~$arch")
fi fi
[ -n "$latest" ] && _extract_version "$1" && ./helper.sh && return 0; [ -n "$latest" ] && _extract_version "$latest" && ./helper.sh && return 0;
fi fi
_get_latest "$1" "${package_offset[$1]:-0}" "$arch" _get_latest "$1" "${package_offset[$1]:-0}" "$arch"
[ -n "$latest" ] && _extract_version "$1" && ./helper.sh && return 0; [ -n "$latest" ] && _extract_version "$latest" && ./helper.sh && return 0;
ewarn "No version found for package: $1$( (( ! offset == 0 )) && echo " with offset $offset")" ewarn "No version found for package: $1$( (( ! ${package_offset[$1]:-0} == 0 )) && echo " with offset $offset")"
} }

2
helper.sh
View File

@ -206,6 +206,6 @@ function _extract_version() {
ebuild=${ebuild%.ebuild} ebuild=${ebuild%.ebuild}
revision=$(echo "$ebuild" | sed -n 's/.*\(-r[0-9]\+\).*/\1/p') revision=$(echo "$ebuild" | sed -n 's/.*\(-r[0-9]\+\).*/\1/p')
ebuild=${ebuild/-r[[:digit:]]} ebuild=${ebuild/-r[[:digit:]]}
ebuild=${ebuild##*=} ebuild=${ebuild##*-}
echo "$ebuild$revision" echo "$ebuild$revision"
} }