From 31a19114e5e701900902b6544ddebddd12de123b Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Fri, 13 Oct 2017 12:30:24 +0200
Subject: [PATCH] evoacme: readability of tests

change from :
"what I don't want" && error
to :
"what I want" || error
---
 evoacme/files/evoacme.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/evoacme/files/evoacme.sh b/evoacme/files/evoacme.sh
index c20714c4..342ab9b1 100755
--- a/evoacme/files/evoacme.sh
+++ b/evoacme/files/evoacme.sh
@@ -98,17 +98,17 @@ main() {
     CERTBOT_BIN=$(command -v certbot) || error "certbot command not installed"
 
     # double check for directories
-    [ ! -d "${ACME_DIR}" ] && error "${ACME_DIR} is not a directory"
-    [ ! -d "${CSR_DIR}" ] && error "${CSR_DIR} is not a directory"
-    [ ! -d "${LOG_DIR}" ] && error "${LOG_DIR} is not a directory"
+    [ -d "${ACME_DIR}" ] || error "${ACME_DIR} is not a directory"
+    [ -d "${CSR_DIR}" ]  || error "${CSR_DIR} is not a directory"
+    [ -d "${LOG_DIR}" ]  || error "${LOG_DIR} is not a directory"
 
     #### CSR VALIDATION
 
     # verify .csr file
     CSR_FILE="${CSR_DIR}/${VHOST}.csr"
     debug "Using CSR file: ${CSR_FILE}"
-    [ ! -f "${CSR_FILE}" ] && error "${CSR_FILE} absent"
-    [ ! -r "${CSR_FILE}" ] && error "${CSR_FILE} is not readable"
+    [ -f "${CSR_FILE}" ] || error "${CSR_FILE} absent"
+    [ -r "${CSR_FILE}" ] || error "${CSR_FILE} is not readable"
 
     csr_verify "${CSR_FILE}" || error "${CSR_FILE} is invalid"
 
@@ -145,7 +145,7 @@ main() {
     #### CERTIFICATE CREATION WITH CERTBOT
 
     ITERATION=$(date "+%Y%m%d%H%M%S")
-    [ -z "${ITERATION}" ] && error "invalid iteration (${ITERATION})"
+    [ -n "${ITERATION}" ] || error "invalid iteration (${ITERATION})"
 
     NEW_DIR="${CRT_DIR}/${VHOST}/${ITERATION}"