From e279e7e4951087c3e5d29d19602057000f455a41 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Wed, 11 Apr 2012 17:57:04 -0300 Subject: Enclosing config with quotes / changing default keyserver --- firma | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'firma') diff --git a/firma b/firma index 3c40377..781e5b8 100755 --- a/firma +++ b/firma @@ -45,7 +45,7 @@ $(AdminHelp) For help with admin and config paramaters, type $BASENAME --help task-name Report bugs to , encrypting your message using the -public key 0xD68AFEDC, available at keyserver.noreply.org." +public key 0xD68AFEDC, available at keys.indymedia.org." } @@ -218,7 +218,7 @@ WARNING: Setting USE_GPG_HIDDEN_RECIPIENT_OPTION to '0' for this run." # check KEYSERVER value if [[ -z "$(echo "$KEYSERVER" | tr -d '[:space:]')" ]]; then - KEYSERVER="keyserver.noreply.org" + KEYSERVER="keys.indymedia.org" fi fi @@ -2197,7 +2197,7 @@ function EvalConfigParameter { return 1 fi - echo "$(grep "^$2=" $1 | sed -e "s/^$2=//" | tail -n 1)" + echo "$(grep "^$2=" $1 | sed -e "s/^$2='//" -e "s/'$//" | tail -n 1)" } @@ -2262,7 +2262,7 @@ function SourceFirmaConfig { REMOVE_THESE_HEADERS_ON_ALL_LISTS="$(EvalConfigParameter $FIRMA_CONFIG_FILE REMOVE_THESE_HEADERS_ON_ALL_LISTS)" [[ "$1" == "help" ]] && echo -e "\tKEYSERVER= default keyserver to import/export keys -\t (defaults to keyserver.noreply.org)." || \ +\t (defaults to keys.indymedia.org)." || \ KEYSERVER="$(EvalConfigParameter $FIRMA_CONFIG_FILE KEYSERVER)" } @@ -2335,7 +2335,7 @@ function SourceListConfig { SILENTLY_DISCARD_INVALID_MESSAGES="$(EvalConfigParameter $LIST_CONFIG_FILE SILENTLY_DISCARD_INVALID_MESSAGES)" [[ "$1" == "help" ]] && echo -e "\tKEYSERVER= default keyserver to import/export keys -\t (defaults to keyserver.noreply.org)." || \ +\t (defaults to keys.indymedia.org)." || \ keyserver="$(EvalConfigParameter $LIST_CONFIG_FILE KEYSERVER)" [[ -n "$keyserver" ]] && KEYSERVER="$keyserver" -- cgit v1.2.3