39 lines
1.1 KiB
Diff
39 lines
1.1 KiB
Diff
From ea4c4154205372154457c794513ae46b61ea4e4c Mon Sep 17 00:00:00 2001
|
|
From: Dave Reisner <dreisner@archlinux.org>
|
|
Date: Mon, 4 Aug 2014 08:31:37 -0400
|
|
Subject: [mkinitcpio] [PATCH] avoid compound conditional leading to spurious
|
|
"errors"
|
|
|
|
As seen:
|
|
|
|
https://bbs.archlinux.org/viewtopic.php?id=185204
|
|
https://bbs.archlinux.org/viewtopic.php?id=185265
|
|
---
|
|
functions | 8 ++++++--
|
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/functions b/functions
|
|
index 20bbffe..362d07b 100644
|
|
--- a/functions
|
|
+++ b/functions
|
|
@@ -423,11 +423,15 @@ add_full_dir() {
|
|
|
|
for f in "$1"/*; do
|
|
if [[ -L $f ]]; then
|
|
- [[ $f = $filter ]] && add_symlink "$f" "$(readlink "$f")"
|
|
+ if [[ $f = $filter ]]; then
|
|
+ add_symlink "$f" "$(readlink "$f")"
|
|
+ fi
|
|
elif [[ -d $f ]]; then
|
|
add_full_dir "$f"
|
|
elif [[ -f $f ]]; then
|
|
- [[ $f = $filter ]] && add_file "$f"
|
|
+ if [[ $f = $filter ]]; then
|
|
+ add_file "$f"
|
|
+ fi
|
|
fi
|
|
done
|
|
fi
|
|
--
|
|
2.1.0
|
|
|