aboutsummaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorAndrew Robbins <contact@andrewrobbins.info>2017-07-11 23:12:38 -0400
committerAndrew Robbins <contact@andrewrobbins.info>2017-07-11 23:12:38 -0400
commit379c69bf12fa191abbbe3a16545dbace3455f7fa (patch)
tree8c65246c0a95da83761430a481709b9cc674dac1 /libs
parentc4dcb20a18150c3471d3c44122af866f35482c57 (diff)
downloadlibrebootfr-379c69bf12fa191abbbe3a16545dbace3455f7fa.tar.gz
librebootfr-379c69bf12fa191abbbe3a16545dbace3455f7fa.zip
Enable 'extglob' and replace some brace expansions
Replace brace expansions with extended globs in a couple of places where brace expansions were erroneously used in place of actual pattern matching. This avoids potential errors concerning nonexisting files when patching sources.
Diffstat (limited to 'libs')
-rwxr-xr-xlibs/git2
-rwxr-xr-xlibs/project2
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/git b/libs/git
index 5869825d..550c5d60 100755
--- a/libs/git
+++ b/libs/git
@@ -243,7 +243,7 @@ git_project_patch_recursive() {
git_project_patch_recursive "${project}" "${repository}" "${branch}" "$(dirname "${path}")"
fi
- for patch in "${patches_path}"/[!.]*.{patch,diff}; do
+ for patch in "${patches_path}"/[!.]*.@(patch|diff); do
if [[ "${patch##*.}" == "patch" ]]; then
git_patch "${repository_path}" "${branch}" "${patch}"
else
diff --git a/libs/project b/libs/project
index 2728d4fa..d2779224 100755
--- a/libs/project
+++ b/libs/project
@@ -465,7 +465,7 @@ project_sources_prepare_patch() {
local project_path="$(project_path "${project}")"
local patches_path="${project_path}/${PATCHES}"
- for patch in "${patches_path}"/[!.]*.{patch,diff}; do
+ for patch in "${patches_path}"/[!.]*.@(patch|diff); do
diff_patch_file "${sources_path}" "${patch}"
done
}