change on config parameter evaluation

diff --git a/firma b/firma
index fe22f437d45c82a692089adb86ee201d7d21b067..dc160d35dc4369a7e16063dc2d8e374cfd6f368a 100755 (executable)
--- 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`"