Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorIvan Kanakarakis <ivan.kanak@gmail.com>2011-04-21 16:59:07 +0300
committerDan McGee <dan@archlinux.org>2011-04-21 12:10:31 -0500
commit908e9f41ed19685a7442acf629220e20b7c003a2 (patch)
treea2e1f387bf94562692ef0c3eb70249b0f83c5a61 /scripts
parentfdbcc9847d7e13b96328adb5f34932eea7ca6ba9 (diff)
pacman-key: improved reading of the configuration file
This commit replaces the find_config() function with the get_from() function. get_from expects two arguments, the first is the file to read and the second is the key to look for in the given file. get_from returns the first matching value for the given key. The file is expected to be in the format: key = value Each of 'key' 'equal sign' 'value' can be surrounded be random whitespace. Signed-off-by: Ivan Kanakarakis <ivan.kanak@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/pacman-key.sh.in22
1 files changed, 13 insertions, 9 deletions
diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in
index 73f4a776..c0929897 100644
--- a/scripts/pacman-key.sh.in
+++ b/scripts/pacman-key.sh.in
@@ -82,11 +82,17 @@ This is free software; see the source for copying conditions.\n\
There is NO WARRANTY, to the extent permitted by law.\n")"
}
-find_config() {
- # Prints on stdin the values of all the options from the configuration file that
- # are associated with the first parameter of this function.
- # The option names are stripped
- grep -e "^[[:blank:]]*$1[[:blank:]]*=.*" "$CONFIG" | cut -d= -f 2-
+# Read provided file and search for values matching the given key
+# The contents of the file are expected to be in this format: key = value
+# 'key', 'equal sign' and 'value' can be surrounded by random whitespace
+# Usage: get_from "$file" "$key" # returns the value for the first matching key in the file
+get_from() {
+ while read key _ value; do
+ if [[ $key = $2 ]]; then
+ echo "$value"
+ break
+ fi
+ done < "$1"
}
reload_keyring() {
@@ -154,7 +160,7 @@ reload_keyring() {
fi
# List of keys that must be kept installed, even if in the list of keys to be removed
- local HOLD_KEYS=$(find_config "HoldKeys")
+ local HOLD_KEYS=$(get_from "$CONFIG" "HoldKeys")
# Remove the keys that must be kept from the set of keys that should be removed
if [[ -n ${HOLD_KEYS} ]]; then
@@ -239,9 +245,7 @@ if [[ ! -r "${CONFIG}" ]]; then
fi
# Read GPGDIR from $CONFIG.
-# The pattern is: any spaces or tabs, GPGDir, any spaces or tabs, equal sign
-# and the rest of the line. The string is splitted after the first occurrence of =
-if [[ GPGDIR=$(find_config "GPGDir") == 0 ]]; then
+if [[ GPGDIR=$(get_from "$CONFIG" "GPGDir") == 0 ]]; then
PACMAN_KEYRING_DIR="${GPGDIR}"
fi
GPG_PACMAN="gpg --homedir ${PACMAN_KEYRING_DIR} --no-permission-warning"