From b20b7b03053f94499085a4570a241428b5676ce2 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Mon, 4 Nov 2013 11:23:01 -0500
Subject: normalize on "[[" instead of "["

---
 src/abslibre-tools/librerelease | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/abslibre-tools/librerelease')

diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease
index adfb935..d133571 100755
--- a/src/abslibre-tools/librerelease
+++ b/src/abslibre-tools/librerelease
@@ -80,12 +80,12 @@ create_signature() {
 }
 
 sign_packages() {
-	if [ -z "${GPG_AGENT_INFO}" ]; then
+	if [[ -z "${GPG_AGENT_INFO}" ]]; then
 		warning "It's better to use gpg-agent to sign packages in batches"
 	fi
 
 	for package in $(find "${WORKDIR}/staging/" -type f -iname '*.pkg.tar.?z'); do
-		if [ -f "${package}.sig" ]; then
+		if [[ -f "${package}.sig" ]]; then
 			msg2 "Package signature found, verifying..."
 
 			# Verify that the signature is correct, else remove for re-signing
@@ -95,7 +95,7 @@ sign_packages() {
 			fi
 		fi
 
-		if ! [ -f "${package}.sig" ]; then
+		if ! [[ -f "${package}.sig" ]]; then
 			create_signature "$package" || return 2
 		fi
 	done
-- 
cgit v1.2.3-2-g168b


From c230cf6bea67623b3741720255a2acc0075a7965 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Mon, 4 Nov 2013 11:24:25 -0500
Subject: librerelease: mention `gpg-agent --daemon` instead of just
 `gpg-agent`

---
 src/abslibre-tools/librerelease | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/abslibre-tools/librerelease')

diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease
index d133571..70ff416 100755
--- a/src/abslibre-tools/librerelease
+++ b/src/abslibre-tools/librerelease
@@ -81,7 +81,7 @@ create_signature() {
 
 sign_packages() {
 	if [[ -z "${GPG_AGENT_INFO}" ]]; then
-		warning "It's better to use gpg-agent to sign packages in batches"
+		warning "It's better to have \`%s\` running to sign packages in batches" 'gpg-agent --daemon'
 	fi
 
 	for package in $(find "${WORKDIR}/staging/" -type f -iname '*.pkg.tar.?z'); do
-- 
cgit v1.2.3-2-g168b


From 66924443eaf0d4342531323d00add4e14498b76f Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Mon, 4 Nov 2013 11:25:14 -0500
Subject: librerelease: don't redirect output of gpg --detach-sign

This should fix fauno's issue with pinentry-curses, or at least fail more
verbosely.
---
 src/abslibre-tools/librerelease | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/abslibre-tools/librerelease')

diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease
index 70ff416..b77b6ec 100755
--- a/src/abslibre-tools/librerelease
+++ b/src/abslibre-tools/librerelease
@@ -68,7 +68,7 @@ create_signature() {
 		SIGNWITHKEY="-u ${GPGKEY}"
 	fi
 	# The signature will be generated directly in ascii-friendly format
-	gpg --detach-sign --use-agent ${SIGNWITHKEY} "$filename" &>/dev/null || ret=$?
+	gpg --detach-sign --use-agent ${SIGNWITHKEY} "$filename" || ret=$?
 
 
 	if (( ! ret )); then
-- 
cgit v1.2.3-2-g168b