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

remove -d globbing

Browse Source
This commit is contained in:
fabolous005 2024-10-06 01:30:57 +02:00
parent 16e086739d
commit 005b627eda
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
etools
View File

@ -50,15 +50,17 @@ function etools_smart_find() {
# NOTE: get latest enabled version for a given package name # NOTE: get latest enabled version for a given package name
function etools_get_version() { function etools_get_version() {
[ -z "$1" ] && eerror "Pass a package name to this function" "\n" && return 2; [ -z "$1" ] && eerror "Pass a package name to this function" "\n" && return 2;
# WARN: turns out ir doesn't for dir in "$ETOOLS_REPO_PATH"/*/"$1"; do
# in this case globs work with -d [ ! -d "$dir" ] && \
# shellcheck disable=SC2144 [ "$ETOOLS_DEBUG" ] && einfo "checked path $dir" "\n" && false
[ ! -d "${ETOOLS_REPO_PATH}"/*/"$1" ] && \ done || \
[ "$ETOOLS_DEBUG" ] && einfo "checked path ${ETOOLS_REPO_PATH}/*/$1" "\n" && \ for dir in /var/db/repos/*/"$1"; do
[ ! -d /var/db/repos/*/"$1" ] && \ [ ! -d "$dir" ] && \
[ "$ETOOLS_DEBUG" ] && einfo "checked path /var/db/repos/*/$1" "\n" && \ [ "$ETOOLS_DEBUG" ] && einfo "checked path $dir" "\n" && \
eerror "Pass a package name to this function" "\n" && \ eerror "Pass a package name to this function" "\n" && \
return 2; return 2;
done
local latest=: local latest=:
. "$ETOOLS_DIR"/helper.sh . "$ETOOLS_DIR"/helper.sh
@ -89,11 +91,13 @@ function etools_get_version() {
# NOTE: get currently installed version # NOTE: get currently installed version
function etools_current_version() { function etools_current_version() {
[ -z "$1" ] && eerror "Pass a package name to this function" "\n" && return 2; [ -z "$1" ] && eerror "Pass a package name to this function" "\n" && return 2;
# for packages with multiple version this errors for file in /var/db/pkg/"$1"-[0-9]*; do
[ ! -d /var/db/pkg/"$1"-[0-9]* ] 2>/dev/null && \ [ ! -d "$file" ] && {
[ "$ETOOLS_DEBUG" ] && einfo "checked path /var/db/pkg/$1-[0-9]*" "\n" && \ [ "$ETOOLS_DEBUG" == true ] && einfo "checked path $file" "\n"
} && \
eerror "Pass a package name to this function" "\n" && \ eerror "Pass a package name to this function" "\n" && \
return 2; return 2;
done
local latest=: local latest=:
local files_content=() local files_content=()
. "$ETOOLS_DIR"/helper.sh . "$ETOOLS_DIR"/helper.sh
@ -103,7 +107,7 @@ function etools_current_version() {
files_content+=("$(<"${file}PF")") files_content+=("$(<"${file}PF")")
fi fi
done done
[ -z "${files_content[0]}" ] && eerror "Could not find any packages" "\n" && exit 1; [ -z "${files_content[0]}" ] && eerror "Could not find any packages" "\n" && return 1;
if [[ -z "$2" ]]; then if [[ -z "$2" ]]; then
for package in "${files_content[@]}"; do for package in "${files_content[@]}"; do
_extract_version "$package" _extract_version "$package"