summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-06-30 10:41:49 -0500
committerDan McGee <dan@archlinux.org>2011-06-30 10:41:49 -0500
commitc2cce4f3f5e0381d107ced3fee3ab0d7240653d1 (patch)
tree920d8746ac1fe19c979bd4d82862ca9052d9777b
parentad577b3cb46dcaf1b143c55324a6eecf9f0ad7f1 (diff)
parent9a29888ba72694ed0a8cba620387b3ee1ee39baa (diff)
downloadpacman-c2cce4f3f5e0381d107ced3fee3ab0d7240653d1.tar.xz
Merge remote-tracking branch 'dave/makepkg'
-rw-r--r--scripts/makepkg.sh.in8
1 files changed, 3 insertions, 5 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 10272b38..98bed3e2 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -284,7 +284,7 @@ check_option() {
# ? - not found
##
check_buildenv() {
- echo $(in_opt_array "$1" ${BUILDENV[@]})
+ in_opt_array "$1" ${BUILDENV[@]}
}
@@ -1134,7 +1134,7 @@ create_package() {
# check for changelog/install files
for i in 'changelog/.CHANGELOG' 'install/.INSTALL'; do
- IFS='/' read -r orig dest <<< "$i"
+ IFS='/' read -r orig dest < <(printf '%s\n' "$i")
if [[ -n ${!orig} ]]; then
msg2 "$(gettext "Adding %s file...")" "$orig"
@@ -2009,9 +2009,7 @@ if [[ -n "${PKGLIST[@]}" ]]; then
fi
# check if gpg signature is to be created and if signing key is valid
-if [[ -z "$SIGNPKG" && $(check_buildenv sign) == 'y' ]]; then
- SIGNPKG='y'
-fi
+[[ -z $SIGNPKG ]] && SIGNPKG=$(check_buildenv sign)
if [[ $SIGNPKG == 'y' ]]; then
if ! gpg --list-key ${GPGKEY} &>/dev/null; then
if [[ ! -z $GPGKEY ]]; then