sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shell.req (CleanupRpmRequires): allow e.g. executable(\ls) and executable("ls")

Browse Source
This commit is contained in:
Alexey Tourbin 2007-10-08 00:40:15 +04:00
parent 66df05529b
commit 536241cbbe
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/shell.req.in
View File

@ -87,9 +87,7 @@ ShellReq()
CleanupRpmRequires()
{
printf '%s\n' "$reqs" |
# I do not use 'read -r' here deliberately:
# I want to transform e.g. 'executable(\ls)' -> 'executable(ls)'
while read line; do
while read -r line; do
# NB: grep and sed are expensive here.
case "$line" in
# Basic sanity check for --rpm-requires output.
@ -97,7 +95,8 @@ ShellReq()
'executable('*[A-Za-z0-9]*')' | 'function('*[A-Za-z0-9]*')' ) ;;
*) Info "$f: invalid $sh --rpm-requires output: $line"; continue ;;
esac
set -- $(IFS="($IFS)"; echo $line)
# Allow e.g. executable(\ls) and executable("ls").
set -- $(IFS="($IFS\\'\")"; echo $line)
case $# in
2) ;;
*) Info "$f: invalid $sh --rpm-requires output: $line"; continue ;;