summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <d@falconindy.com>2011-12-11 05:10:49 +0100
committerDan McGee <dan@archlinux.org>2011-12-12 19:47:46 +0100
commit5f0df423033c94e8ae52ca642284bf6a50fa9bbb (patch)
tree07b203665d2b26ebc2529b336af9d832c08314b2
parent1a1f5540a4533ea41038128026c75fe023410a99 (diff)
downloadpacman-5f0df423033c94e8ae52ca642284bf6a50fa9bbb.tar.gz
pacman-5f0df423033c94e8ae52ca642284bf6a50fa9bbb.tar.xz
makepkg: split source elements when looking for sigs
Allows renamed .asc/.sig files to be still discovered by makepkg. This is needed for a package such as PuTTY, which provides abnormally named sig files (.DSA and .RSA) which are valid input for gpg --verify. Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--scripts/makepkg.sh.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index a0a94fe1..a4a3d13d 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -331,10 +331,10 @@ in_array() {
return 1 # Not Found
}
-source_has_signatures(){
+source_has_signatures() {
local file
for file in "${source[@]}"; do
- if [[ $file = *.@(sig?(n)|asc) ]]; then
+ if [[ ${file%%::*} = *.@(sig?(n)|asc) ]]; then
return 0
fi
done