Skip to content

Commit 8eb215f

Browse files
committed
post-pbs-install: fix component_exists_in_sources matching substrings of hyphenated tokens
1 parent 506ca2c commit 8eb215f

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

tools/pve/post-pbs-install.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,14 @@ repo_state_list() {
6262

6363
component_exists_in_sources() {
6464
local component="$1"
65-
grep -h -E "^[^#]*Components:[^#]*\b${component}\b" /etc/apt/sources.list.d/*.sources 2>/dev/null | grep -q .
65+
local line comp
66+
while IFS= read -r line; do
67+
line="${line#*Components:}"
68+
for comp in $line; do
69+
[[ "$comp" == "$component" ]] && return 0
70+
done
71+
done < <(grep -h -E "^[^#]*Components:" /etc/apt/sources.list.d/*.sources 2>/dev/null)
72+
return 1
6673
}
6774

6875
require_whiptail() {

0 commit comments

Comments
 (0)