Skip to content

Commit

Permalink
updated to ignore -r flag if -c is used
Browse files Browse the repository at this point in the history
  • Loading branch information
srvrco committed Jan 12, 2017
1 parent 5e3af6b commit 0f895ec
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
3 changes: 2 additions & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion checkssl
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 0f895ec

Please sign in to comment.