From 452bf71cec7a1a62bbee9d106733ad9ed398c6ee Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Tue, 28 Jun 2011 22:35:10 -0400 Subject: makepkg: remove unneeded echo Signed-off-by: Dave Reisner --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ed5cdef7..c988554a 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[@]} } -- cgit v1.2.3-24-g4f1b From 5f6e8c92741939a098bc14371fcde904fc9ed613 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Tue, 28 Jun 2011 22:35:44 -0400 Subject: makepkg: fix vim syntax highlighting Signed-off-by: Dave Reisner --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c988554a..b7246f1c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -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" -- cgit v1.2.3-24-g4f1b From 9a29888ba72694ed0a8cba620387b3ee1ee39baa Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Tue, 28 Jun 2011 22:36:41 -0400 Subject: makepkg: simplify SIGNPKG check Signed-off-by: Dave Reisner --- scripts/makepkg.sh.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b7246f1c..b844c65f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2008,9 +2008,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 -- cgit v1.2.3-24-g4f1b