diff options
| -rwxr-xr-x | firma | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -1883,7 +1883,7 @@ function SourceFirmaConfig { # returns: 0 #------------------------------------------------------------- - [ "$1" == "help" ] && echo -e "List mandatory firma config parameters\n\n" + [ "$1" == "help" ] && echo -e "\nList mandatory firma config parameters\n" [ "$1" == "help" ] && echo "GPG_BINARY= path to the GnuPG binary" || \ GPG_BINARY="`EvalConfigParameter $FIRMA_CONFIG_FILE GPG_BINARY`" @@ -1897,7 +1897,7 @@ function SourceFirmaConfig { [ "$1" == "help" ] && echo "LISTS_DIR= path to the mailing lists directory" || \ LISTS_DIR="`EvalConfigParameter $FIRMA_CONFIG_FILE LISTS_DIR`" - [ "$1" == "help" ] && echo -e "List optional firma config parameters\n\n" + [ "$1" == "help" ] && echo -e "\nList optional firma config parameters\n" [ "$1" == "help" ] && echo "USER= user that runs firma (usually the same as your MTA user); defaults to "nobody"; you can also specify this parameter @@ -2216,11 +2216,13 @@ case $# in echo "you should enter PARAMETER='value' (without spaces before or after the equal sign)." SourceFirmaConfig help SourceListConfig help + EXIT_CODE=0 + else + echo >&2 "$(basename $0): too many arguments -- $@" + Usage + EXIT_CODE=1 fi fi - echo >&2 "$(basename $0): too many arguments -- $@" - Usage - EXIT_CODE=1 ;; *) echo >&2 "$(basename $0): invalid option -- $1" |