[pacman-dev] [PATCH] makepkg: place signature symlink in build dir

[Allan McRae]

Be consistent in package and signature placements when using
PKGDEST.

Signed-off-by: Allan McRae <allan at archlinux.org>
---

This patch is on top of Dan's gpg-more branch which has been rebased
onto master (thanks to Xavier for finding my mistake).  As part of the
rebase, I have also gone back through the makepkg/repo-add patches
and changed the style of the tests to what is now used.  All this has
been pushed to the "gpg" branch on my repo.

 scripts/makepkg.sh.in |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 70cf09d..1c02392 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1039,16 +1039,17 @@ create_package() {
 		exit 1 # TODO: error code
 	fi
 
+	create_signature "$pkg_file"
+
 	if (( ! ret )) && [[ "$PKGDEST" != "${startdir}" ]]; then
 		ln -sf "${pkg_file}" "${pkg_file/$PKGDEST/$startdir}"
 		ret=$?
+		[[ -f $pkg_file.sig ]] && ln -sf "$pkg_file.sig" "${pkg_file/$PKGDEST/$startdir}.sig"
 	fi
 
 	if (( ret )); then
 		warning "$(gettext "Failed to create symlink to package file.")"
 	fi
-
-	create_signature "$pkg_file"
 }
 
 create_signature() {
-- 
1.7.0.3