From 0f895ec67a4345545a508b85d4dceaf014509c62 Mon Sep 17 00:00:00 2001 From: srvrco Date: Thu, 12 Jan 2017 11:44:42 +0000 Subject: [PATCH] updated to ignore -r flag if -c is used --- README | 3 ++- checkssl | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/README b/README index 6fb269f..c0f2283 100644 --- a/README +++ b/README @@ -26,7 +26,7 @@ will run the renewssl command with the domain name passed as an argument. If t running checkssl with no arguments gives help; -checkssl ver. 1.07 +checkssl ver. 1.15 Checks ssl certs for a set of domains Usage: checkssl [-h|--help] [-d|--debug] [-f|--file filename] [-s|--server stype] [-l|--location directory] @@ -57,6 +57,7 @@ Options: A domain name can also be specified on the command line + If a file is provided, with a list of domains then each domain can include a port / service for testing i.e. example.com diff --git a/checkssl b/checkssl index a913924..218bf32 100755 --- a/checkssl +++ b/checkssl @@ -42,10 +42,11 @@ # 2016-10-28 add ability to specify REMOTE_EXTRA in file list (1.12) # 2017-01-01 updated checks from shellcheck (1.13) # 2017-01-09 correct typo in cleanup (to remove all tmp files) (1.14) +# 2017-01-12 updated to ignore -r flag if -c is used. (1.15) # --------------------------------------------------------------------------- PROGNAME=${0##*/} -VERSION="1.14" +VERSION="1.15" ORIGCMD="$0 $*" UPDATE_LOCATION="https://raw.githubusercontent.com/srvrco/checkssl/master/checkssl" @@ -267,6 +268,11 @@ if [[ ! $FILEARG && ! $SERVERARG && ! $LOCATIONARG && ! $DOMAINARG ]]; then graceful_exit fi +if [[ $RENEWARG && $COMMANDARG ]]; then + # ignore RENEWARG, since commandarg is running the given command for all domains needing renewal + RENEWARG="" +fi + # create temporary file for the list of domains, and output LIST_OF_DOMAINS=$(mktemp) DATA_OUT=$(mktemp)