From ad55c296d6f01408ae63e2126b00de4a39f2f727 Mon Sep 17 00:00:00 2001
From: Rinsvent <rinsvent007@gmail.com>
Date: Wed, 17 Aug 2022 21:52:48 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B4=D0=B5=D0=BB?=
 =?UTF-8?q?=D0=B0=D0=BB=20=D0=BD=D0=B0=20echo=20=D0=94=D0=BE=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B1=D0=BE=D1=82=D0=B0=D0=BB=20acme=20=D1=81=D0=BA=D1=80?=
 =?UTF-8?q?=D0=B8=D0=BF=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/acme.sh           | 13 +++++++++++++
 src/condition.sh      | 12 ++++++++----
 src/condition.test.sh | 18 ++++++++++++++----
 src/logger.sh         | 12 +++---------
 src/var.sh            | 22 +++++++++++++++-------
 src/var.test.sh       | 15 +++++++++------
 6 files changed, 62 insertions(+), 30 deletions(-)

diff --git a/src/acme.sh b/src/acme.sh
index a9bf588..9f3b03d 100644
--- a/src/acme.sh
+++ b/src/acme.sh
@@ -1 +1,14 @@
 #!/bin/bash
+
+. ./var.sh
+# You should declare ACME_EMAIL/ACME_WEBROOT/ACME_DIRECTORY variables before source
+# generateCertificate $host
+# generateCertificate rinsvent.ru
+generateCertificate () {
+  local email=$(getVar ACME_EMAIL)
+  local webroot=$(getVar ACME_WEBROOT)
+  local directory=$(getVar ACME_DIRECTORY)
+  certbot certonly --noninteractive --agree-tos --cert-name "$1" -d "$1" -m "$email" --webroot -w "$webroot"
+  cp /etc/letsencrypt/live/"$1"/fullchain.pem "$directory"/"$1".pem
+  cp /etc/letsencrypt/live/"$1"/privkey.pem "$directory"/"$1"-key.pem
+}
\ No newline at end of file
diff --git a/src/condition.sh b/src/condition.sh
index 94b6607..b2dbdd0 100644
--- a/src/condition.sh
+++ b/src/condition.sh
@@ -1,11 +1,15 @@
 #!/bin/bash
 
 equal() {
-  local RETURN
-  RETURN=0
   if [[ "$1" = "$2" ]];
   then
-    RETURN=1
+    echo "1"
+  fi
+}
+
+more() {
+  if [[ "$1" = "$2" ]];
+  then
+    echo "1"
   fi
-  echo $RETURN
 }
diff --git a/src/condition.test.sh b/src/condition.test.sh
index 4e43c9f..26f61ac 100644
--- a/src/condition.test.sh
+++ b/src/condition.test.sh
@@ -3,22 +3,32 @@
 . ./condition.sh
 
 # equal
-if [ $(equal 1 1) -eq 1 ]
+if [ "$(equal 1 1)" ]
 then
   echo "equal numeric"
 fi
 
-if [[ $(equal 1 2) -eq 0 ]]
+if [[ ! $(equal 1 2) ]]
 then
   echo "not equal numeric"
 fi
 
-if [[ $(equal "asdf" "asdf") -eq 1 ]]
+if [[ $(equal "asdf" "asdf") ]]
 then
   echo "equal string"
 fi
 
-if [[ $(equal "asdf" "asdf1") -eq 0 ]]
+if [[ ! $(equal "asdf" "asdf1") ]]
 then
   echo "not equal string"
 fi
+
+[ "$(equal "afsdf" "afsdf")" ] && [ "$(equal 1 1)" ] && echo "AND condition 1 && 1"
+[ "$(equal "afsdf" "afs")" ] && [ "$(equal 1 1)" ] && echo "AND condition 0 && 1"
+[ "$(equal "afsdf" "afsdf")" ] && [ "$(equal 1 3)" ] && echo "AND condition 1 && 0"
+[ "$(equal "afsdf" "afsdfsdfg")" ] && [ "$(equal 1 3)" ] && echo "AND condition 0 && 0"
+
+[ "$(equal "afsdf" "afsdf")" ] || [ "$(equal 1 1)" ] && echo "OR condition 1 || 1"
+[ "$(equal "afsdf" "afs")" ] || [ "$(equal 1 1)" ] && echo "OR condition 0 || 1"
+[ "$(equal "afsdf" "afsdf")" ] || [ "$(equal 1 3)" ] && echo "OR condition 1 || 0"
+[ "$(equal "afsdf" "afsdfsdfg")" ] || [ "$(equal 1 3)" ] && echo "OR condition 0 || 0"
diff --git a/src/logger.sh b/src/logger.sh
index 2487355..bc033b7 100644
--- a/src/logger.sh
+++ b/src/logger.sh
@@ -9,18 +9,12 @@
 # info = 3
 # debug = 9
 
-getVar LOGGER_LEVEL 1
-LOGGER_LEVEL=$RETURN
-
-getVar LOG_PATH ''
-LOG_PATH=$RETURN
-
+LOGGER_LEVEL=$(getVar LOGGER_LEVEL 1)
+LOG_PATH=$(getVar LOG_PATH)
 ENDCOLOR="\e[0m"
 
 function getLogPath() {
-  getVar LOG_PATH ''
-  local LOCAL_LOG_PATH=$RETURN
-
+  local LOCAL_LOG_PATH=$(getVar LOG_PATH '')
   local YEAR
   YEAR=$(date +%Y)
   LOCAL_LOG_PATH=$(echo "$LOCAL_LOG_PATH" | sed -r "s/%Y/$YEAR/g")
diff --git a/src/var.sh b/src/var.sh
index 4b5e5a6..1da08a8 100644
--- a/src/var.sh
+++ b/src/var.sh
@@ -1,16 +1,24 @@
 #!/bin/bash
 
 getVar() {
-  VAR_NAME=$1
-  VAR_VALUE=${!VAR_NAME}
-  if [ -z $VAR_VALUE ]
+  local VAR_NAME=$1
+  local VAR_VALUE=${!VAR_NAME}
+  if [ -z "$VAR_VALUE" ]
   then
     if [ $# -eq 2 ]
     then
-      VAR_VALUE=$2
-    else
-      VAR_VALUE=NULL
+      echo "$2"
     fi
+  else
+    echo "$VAR_VALUE"
+  fi
+}
+
+existsVar() {
+  VAR_NAME=$1
+  VAR_VALUE=${!VAR_NAME}
+  if [ -n "$VAR_VALUE" ]
+  then
+    echo "1"
   fi
-  RETURN=$VAR_VALUE
 }
\ No newline at end of file
diff --git a/src/var.test.sh b/src/var.test.sh
index 77c19b6..351fb44 100644
--- a/src/var.test.sh
+++ b/src/var.test.sh
@@ -3,9 +3,12 @@
 TEMP=5234
 . ./var.sh
 
-getVar TEMP false
-echo "RESULT $RETURN"
-getVar TEMP2 false
-echo "RESULT $RETURN"
-getVar TEMP2
-echo "RESULT $RETURN"
+TEMP=$(getVar TEMP false)
+echo "RESULT $TEMP"
+
+echo "RESULT $(getVar TEMP false)"
+echo "RESULT $(getVar TEMP2 false)"
+echo "RESULT $(getVar TEMP2)"
+
+echo "EXISTS $(existsVar TEMP)"
+echo "NOT EXISTS $(existsVar TEMP2)"