diff options
| author | Allan McRae <allan@archlinux.org> | 2010-03-31 15:00:33 +1000 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-03-22 23:52:00 -0500 |
| commit | 2f2f53ddc9f05d00244a41a66eef9ed34bc87463 (patch) | |
| tree | af7e25089e2f0de69398a2f1e96be9048f85e315 | |
| parent | 82e22596d8bfeac89e96d8b2d9eda8e13e14880c (diff) | |
| download | pacman-2f2f53ddc9f05d00244a41a66eef9ed34bc87463.tar.xz | |
makepkg: place signature symlink in build dir
Be consistent in package and signature placements when using
PKGDEST.
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | 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 5d6363f0..5742c492 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1092,16 +1092,17 @@ create_package() { exit 1 # TODO: error code fi + create_signature "$pkg_file" + if (( ! ret )) && [[ ! "$PKGDEST" -ef "${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() { |