aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <info@minifree.org>2017-07-12 09:33:54 +0000
committerGogs <gogitservice@gmail.com>2017-07-12 09:33:54 +0000
commit23e04090f73229d63be11992a1370bd6b9a6ea31 (patch)
tree8c65246c0a95da83761430a481709b9cc674dac1
parentc4dcb20a18150c3471d3c44122af866f35482c57 (diff)
parent379c69bf12fa191abbbe3a16545dbace3455f7fa (diff)
downloadlibrebootfr-23e04090f73229d63be11992a1370bd6b9a6ea31.tar.gz
librebootfr-23e04090f73229d63be11992a1370bd6b9a6ea31.zip
Merge branch 'enable-extglob' of kragle/libreboot into master
-rwxr-xr-xlibreboot2
-rwxr-xr-xlibs/git2
-rwxr-xr-xlibs/project2
3 files changed, 3 insertions, 3 deletions
diff --git a/libreboot b/libreboot
index cb3e3831..ce3735d0 100755
--- a/libreboot
+++ b/libreboot
@@ -16,7 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
GLOBIGNORE=".:.." # This enables the shell option 'dotglob' as well.
-shopt -s nullglob
+shopt -s nullglob extglob
libreboot_usage() {
local action
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
}