rpms/kernel-srpm-macros
7
0
Fork 0
Code Issues Pull Requests Releases Activity

modalias.prov: use standard "match any char not in set" glob pattern, and sed -E option

Browse Source 
[^set] is not correct in glob (it's regexp construct). [!set] is.

sed: -n is not necessary. -e too. manpage recommends using -E instead of -r.

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
This commit is contained in:
Denys Vlasenko 2023-05-07 17:52:19 +02:00
parent 35e1f2fc73
commit 5683c50270
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modalias.prov
View File

@ -109,12 +109,14 @@ for module in $(grep -E '/lib/modules/.+\.ko(\.gz|\.bz2|\.xz|\.zst)?$') "$@"; do
# delete possible extra lines because some modules have *two* version tags. *cough*b44*cough* # delete possible extra lines because some modules have *two* version tags. *cough*b44*cough*
modver=${modver%%$'\n'*} # using $'' bashism, avoid running "head -n1" process modver=${modver%%$'\n'*} # using $'' bashism, avoid running "head -n1" process
# replace any strange chars with underscores. # replace any strange chars with underscores.
modver=${modver//[^0-9a-zA-Z._]/_} # [!...] is glob's "match any char not in set" pattern
# (although bash supports [^...] too, it is not standard)
modver=${modver//[!0-9a-zA-Z._]/_}
# only add version tag if it indeed has a version # only add version tag if it indeed has a version
[ -z "$modver" ] || modver=" = $modver" [ -z "$modver" ] || modver=" = $modver"
/sbin/modinfo -F alias "$module" \ /sbin/modinfo -F alias "$module" \
| sed -nre "s,[^][0-9a-zA-Z._:*?/-],_,g; s,(.+),modalias(\\1)$modver,p" | sed -E "s,[^][0-9a-zA-Z._:*?/-],_,g; s,(.+),modalias(\\1)$modver,"
# Below: combining code can only possibly combine lines of equal length. # Below: combining code can only possibly combine lines of equal length.
# Prepend line lengths before sort, so that same-length lines end up next # Prepend line lengths before sort, so that same-length lines end up next