Skip to content

Commit

Permalink
70-baselibs: do not run subshells
Browse files Browse the repository at this point in the history
  • Loading branch information
DimStar77 committed Oct 16, 2019
1 parent 5e2d51e commit 5275f99
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions 70-baselibs
Expand Up @@ -20,14 +20,13 @@ containsElement () {

BUILTBINARIES=()
if [ -e "$DIR_TO_CHECK/_multibuild" ]; then
sed -n -e 's,.*<\(flavor\|package\)>\([^<]*\)</\(flavor\|package\)>.*,\2,p' \
"$DIR_TO_CHECK/_multibuild" | while read i; do
# PASS if we have trouble parsing the .spec file
BUILTBINARIES+=($($HELPERS_DIR/spec_query --specfile "$DIR_TO_CHECK"/*.spec --print-subpacks \
--buildflavor $i)) || exit 0
BUILTBINARIES+=($($HELPERS_DIR/spec_query --no-conditionals --specfile "$DIR_TO_CHECK"/*.spec --print-subpacks \
--buildflavor $i)) || exit 0
done
while read i; do
# PASS if we have trouble parsing the .spec file
BUILTBINARIES+=($($HELPERS_DIR/spec_query --specfile "$DIR_TO_CHECK"/*.spec --print-subpacks \
--buildflavor $i)) || exit 0
BUILTBINARIES+=($($HELPERS_DIR/spec_query --no-conditionals --specfile "$DIR_TO_CHECK"/*.spec --print-subpacks \
--buildflavor $i)) || exit 0
done < <(sed -n -e 's,.*<\(flavor\|package\)>\([^<]*\)</\(flavor\|package\)>.*,\2,p' "$DIR_TO_CHECK/_multibuild")
fi
for i in "$DIR_TO_CHECK"/*.spec; do
# PASS if we have trouble parsing the .spec file
Expand Down

0 comments on commit 5275f99

Please sign in to comment.