From 0f6b4f4fab767f82469e7f1e919f276a62b4bdc4 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Fri, 31 Jan 2025 15:56:51 +1000 Subject: [PATCH] autodeps: parse LIB_DIRS with more specificity Signed-off-by: Allan McRae --- scripts/libmakepkg/autodep/library_depends.sh.in | 4 ++-- scripts/libmakepkg/autodep/library_provides.sh.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/libmakepkg/autodep/library_depends.sh.in b/scripts/libmakepkg/autodep/library_depends.sh.in index 6f58781b..596a9821 100644 --- a/scripts/libmakepkg/autodep/library_depends.sh.in +++ b/scripts/libmakepkg/autodep/library_depends.sh.in @@ -51,8 +51,8 @@ library_depends() { unset prefix for libdir in ${LIB_DIRS[@]}; do - if [[ ${libdir/*:} == ${libpath} ]]; then - prefix=${libdir/:*} + if [[ ${libdir#*:} == ${libpath} ]]; then + prefix=${libdir%%:*} fi done diff --git a/scripts/libmakepkg/autodep/library_provides.sh.in b/scripts/libmakepkg/autodep/library_provides.sh.in index 374cc841..c92877ad 100644 --- a/scripts/libmakepkg/autodep/library_provides.sh.in +++ b/scripts/libmakepkg/autodep/library_provides.sh.in @@ -28,8 +28,8 @@ autodep_functions+=('library_provides') library_provides() { if check_option "autodeps" "y"; then for lib in ${LIB_DIRS[@]}; do - dir=${lib/*:} - prefix=${lib/:*} + dir=${lib#*:} + prefix=${lib%%:*} if [[ ! -d "$pkgdir/$dir" ]]; then continue;