From 388124b731d23a96c6f62a78b683ad7f34ea97b2 Mon Sep 17 00:00:00 2001 From: rhatto Date: Thu, 12 Oct 2006 18:59:15 +0000 Subject: change on config parameter evaluation --- firma | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/firma b/firma index fe22f43..dc160d3 100755 --- a/firma +++ b/firma @@ -1870,7 +1870,8 @@ function EvalConfigParameter { return 1 fi - echo `grep -e "^$2=" $1 | cut -d = -f 2 | sed -e 's/"//g' -e "s/'//g" | cut -d "#" -f 1 | sort -r | head -n 1` + echo "`grep "^$2=" $1 | sed -e "s/^$2='//" -e "s/'$//" | sort -r | head -n 1`" + } @@ -1965,8 +1966,7 @@ function SourceListConfig { \t25 characters long, combining numbers, upper and lower case letters and at \tleast 5 special characters. Also, no character can be sequentially repeated \tmore than 4 times." || \ - # LIST_PASSPHRASE="`EvalConfigParameter $LIST_CONFIG_FILE LIST_PASSPHRASE`" - LIST_PASSPHASE="`grep "^PASSPHRASE=" $LIST_CONFIG_FILE | sed -e "s/^PASSPHRASE='//" -e "s/'$//" | sort -r | head -n 1`" + LIST_PASSPHRASE="`EvalConfigParameter $LIST_CONFIG_FILE LIST_PASSPHRASE`" [ "$1" == "help" ] && echo -e "\nOptional list config parameters\n" @@ -1987,7 +1987,7 @@ function SourceListConfig { \t instead of sending bounces back to sender" || \ SILENTLY_DISCARD_INVALID_MESSAGES="`EvalConfigParameter $LIST_CONFIG_FILE SILENTLY_DISCARD_INVALID_MESSAGES`" - [ "$1" == "help" ] && echo -e "\tKEYSERVER= default keyserver to import/export keys\n + [ "$1" == "help" ] && echo -e "\tKEYSERVER= default keyserver to import/export keys \t (defaults to keyserver.noreply.org)" || \ KEYSERVER="`EvalConfigParameter $LIST_CONFIG_FILE KEYSERVER`" -- cgit v1.2.3