From c9e46aecc79cae8c8e48c07b1d9e89fc62bba96d Mon Sep 17 00:00:00 2001
From: canyonknight <canyonknight@gmail.com>
Date: Mon, 9 Jan 2012 21:40:00 -0500
Subject: [PATCH 1/2] Turn gpg commands into functions in pacman-key

Adds functions for every gpg command. By pulling out the gpg commands from the
"program start" section, additional commands can be run before or after a
specific gpg command without adding clutter to the function call section.

This change creates the framework for additional error messages, proper return
codes, and exit codes being added to every pacman-key gpg call.

Signed-off-by: canyonknight <canyonknight@gmail.com>
---
 scripts/pacman-key.sh.in |   70 ++++++++++++++++++++++++++++++++++++---------
 1 files changed, 56 insertions(+), 14 deletions(-)

diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in
index 689dc56..1fd74a7 100644
--- a/scripts/pacman-key.sh.in
+++ b/scripts/pacman-key.sh.in
@@ -338,6 +338,14 @@ populate_keyring() {
 	fi
 }
 
+add_keys() {
+	"${GPG_PACMAN[@]}" --quiet --batch --import "${KEYFILES[@]}"
+}
+
+delete_keys() {
+	"${GPG_PACMAN[@]}" --quiet --batch --delete-key --yes "${KEYIDS[@]}"
+}
+
 edit_keys() {
 	local errors=0;
 	for key in "${KEYIDS[@]}"; do
@@ -354,6 +362,14 @@ edit_keys() {
 	done
 }
 
+export_keys() {
+	"${GPG_PACMAN[@]}" --armor --export "${KEYIDS[@]}"
+}
+
+finger_keys() {
+	"${GPG_PACMAN[@]}" --batch --fingerprint "${KEYIDS[@]}"
+}
+
 import_trustdb() {
 	local importdir
 
@@ -375,6 +391,35 @@ import() {
 	done
 }
 
+list_keys() {
+	"${GPG_PACMAN[@]}" --batch --list-keys "${KEYIDS[@]}"
+}
+
+list_sigs() {
+	"${GPG_PACMAN[@]}" --batch --list-sigs "${KEYIDS[@]}"
+}
+
+lsign_keys() {
+	printf 'y\ny\n' | LANG=C "${GPG_PACMAN[@]}" --command-fd 0 --quiet --batch --lsign-key "${KEYIDS[@]}" 2>/dev/null
+}
+
+receive_keys() {
+	"${GPG_PACMAN[@]}" --recv-keys "${KEYIDS[@]}"
+}
+
+refresh_keys() {
+	"${GPG_PACMAN[@]}" --refresh-keys "${KEYIDS[@]}"
+}
+
+verify_sig() {
+	"${GPG_PACMAN[@]}" --verify $SIGNATURE
+}
+
+updatedb() {
+	msg "$(gettext "Updating trust database...")"
+	"${GPG_PACMAN[@]}" --batch --check-trustdb
+}
+
 # PROGRAM START
 if ! type gettext &>/dev/null; then
 	gettext() {
@@ -476,27 +521,24 @@ esac
 
 (( ! INIT )) && check_keyring
 
-(( ADD )) && "${GPG_PACMAN[@]}" --quiet --batch --import "${KEYFILES[@]}"
-(( DELETE )) && "${GPG_PACMAN[@]}" --quiet --batch --delete-key --yes "${KEYIDS[@]}"
+(( ADD )) && add_keys
+(( DELETE )) && delete_keys
 (( EDITKEY )) && edit_keys
-(( EXPORT )) && "${GPG_PACMAN[@]}" --armor --export "${KEYIDS[@]}"
-(( FINGER )) && "${GPG_PACMAN[@]}" --batch --fingerprint "${KEYIDS[@]}"
+(( EXPORT )) && export_keys
+(( FINGER )) && finger_keys
 (( IMPORT )) && import
 (( IMPORT_TRUSTDB)) && import_trustdb
 (( INIT )) && initialize
-(( LISTKEYS )) && "${GPG_PACMAN[@]}" --batch --list-keys "${KEYIDS[@]}"
-(( LISTSIGS )) && "${GPG_PACMAN[@]}" --batch --list-sigs "${KEYIDS[@]}"
-if (( LSIGNKEY )); then
-	printf 'y\ny\n' | LANG=C "${GPG_PACMAN[@]}" --command-fd 0 --quiet --batch --lsign-key "${KEYIDS[@]}" 2>/dev/null
-fi
+(( LISTKEYS )) && list_keys
+(( LISTSIGS )) && list_sigs
+(( LSIGNKEY )) && lsign_keys
 (( POPULATE )) && populate_keyring
-(( RECEIVE )) && "${GPG_PACMAN[@]}" --recv-keys "${KEYIDS[@]}"
-(( REFRESH )) && "${GPG_PACMAN[@]}" --refresh-keys "${KEYIDS[@]}"
-(( VERIFY )) && "${GPG_PACMAN[@]}" --verify "$SIGNATURE"
+(( RECEIVE )) && receive_keys
+(( REFRESH )) && refresh_keys
+(( VERIFY )) && verify_sig
 
 if (( UPDATEDB )); then
-	msg "$(gettext "Updating trust database...")"
-	"${GPG_PACMAN[@]}" --batch --check-trustdb
+	updatedb
 fi
 
 # vim: set ts=2 sw=2 noet:
-- 
1.7.8.3