Fixes #516

matteocorti · Sep 10, 2024 · e232330 · e232330
1 parent 1221530
commit e232330
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 8 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -266,8 +266,8 @@ authors:
   given-names: "Дилян"
   website: https://github.com/dilyanpalauzov
 title: "check_ssl_cert"
-version: 2.83.0
-date-released: 2024-08-15
+version: 2.83.1
+date-released: 2024-09-10
 url: "https://github.com/matteocorti/check_ssl_cert"
 repository-code: "https://github.com/matteocorti/check_ssl_cert"
 keywords:

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2024-09-10  Matteo Corti  <[email protected]>
+
+        * check_ssl_cert (check_option_argument): fixed a problem with | in the output
+
 2024-07-11  Matteo Corti  <[email protected]>
 
         * check_ssl_cert (main): fetch HTTP headers for --debug-headers even if no header check is enabled

diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,7 @@
 # News
 
+* 2024-09-10 Version 2.83.1
+  * Fixes the output of missing arguments on Nagios
 * 2024-08-15 Version 2.83.0
   * Shows ```--info``` event in case of a problem
 * 2024-07-11, Version 2.82.0

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1 +1 @@
-Shows ```--info``` event in case of a problem
+Fixes the output of missing arguments on Nagios
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.83.0
+2.83.1
diff --git a/check_ssl_cert b/check_ssl_cert
@@ -26,7 +26,7 @@
 ################################################################################
 # Constants
 
-VERSION=2.83.0
+VERSION=2.83.1
 SHORTNAME="SSL_CERT"
 
 VALID_ATTRIBUTES=",startdate,enddate,subject,issuer,modulus,serial,hash,email,ocsp_uri,fingerprint,"
@@ -3086,9 +3086,13 @@ ascii_grep() {
 #  $2 next command line parameter
 check_option_argument() {
 
+    # the majority of the options is specided as '-s|--long'
+    # but | is a problem for Nagios: we substitute it with ', '
+    option=$( echo "${1}" | sed 's/|/, /' )
+
     # shellcheck disable=SC2295
     if [ -z "$2" ] || [ "${2%${2#?}}"x = '-x' ]; then
-        unknown "'${1}' requires an argument"
+        unknown "'${option}' requires an argument"
     fi
 
 }

diff --git a/check_ssl_cert.1 b/check_ssl_cert.1
@@ -1,7 +1,7 @@
 .\" Process this file with
 .\" groff -man -Tascii check_ssl_cert.1
 .\"
-.TH "check_ssl_cert" 1 "August, 2024" "2.83.0" "USER COMMANDS"
+.TH "check_ssl_cert" 1 "September, 2024" "2.83.1" "USER COMMANDS"
 .SH NAME
 check_ssl_cert \- checks the validity of X.509 certificates
 .SH SYNOPSIS

diff --git a/check_ssl_cert.spec b/check_ssl_cert.spec
@@ -1,4 +1,4 @@
-%global version          2.83.0
+%global version          2.83.1
 %global release          0
 %global sourcename       check_ssl_cert
 %global packagename      nagios-plugins-check_ssl_cert
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue September 10 2024 Matteo Corti <[email protected]> - 2.83.1-0
+- Updated to 2.83.1
+
 * Tue August 28 2024 Matteo Corti <[email protected]> - 2.83.0-0
 - Updated to 2.83.0
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Shows ```--info``` event in case of a problem
		Fixes the output of missing arguments on Nagios