From b20bbb3eb21b056f1f822e4abb66d1aef921a794 Mon Sep 17 00:00:00 2001
From: ttionya <git@ttionya.com>
Date: Mon, 1 Mar 2021 21:59:12 +0800
Subject: [PATCH] Revert "feat: remove unnecessary test -n"

This reverts commit 8f4d8620b6ea89e3d4a6015e5b1302c4475d4278.
---
 scripts/entrypoint.sh |  2 +-
 scripts/restore.sh    | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/scripts/entrypoint.sh b/scripts/entrypoint.sh
index ac7c48a..a11d3cb 100644
--- a/scripts/entrypoint.sh
+++ b/scripts/entrypoint.sh
@@ -14,7 +14,7 @@ if [[ "$1" == "mail" ]]; then
     MAIL_SMTP_ENABLE="TRUE"
     MAIL_DEBUG="TRUE"
 
-    if [[ "$2" ]]; then
+    if [[ -n "$2" ]]; then
         MAIL_TO="$2"
     fi
 
diff --git a/scripts/restore.sh b/scripts/restore.sh
index 03edc0c..b1ae74e 100644
--- a/scripts/restore.sh
+++ b/scripts/restore.sh
@@ -19,7 +19,7 @@ function restore_zip() {
     local FIND_FILE_CONFIG
     local FIND_FILE_ATTACHMENTS
 
-    if [[ "${ZIP_PASSWORD}" ]]; then
+    if [[ -n "${ZIP_PASSWORD}" ]]; then
         7z e -aoa -p"${ZIP_PASSWORD}" -o"${RESTORE_EXTRACT_DIR}" "${RESTORE_FILE_ZIP}"
     else
         7z e -aoa -o"${RESTORE_EXTRACT_DIR}" "${RESTORE_FILE_ZIP}"
@@ -35,21 +35,21 @@ function restore_zip() {
     # get restore db file
     RESTORE_FILE_DB=""
     FIND_FILE_DB="$( basename "$(ls ${RESTORE_EXTRACT_DIR}/db.*.sqlite3)" )"
-    if [[ "${FIND_FILE_DB}" ]]; then
+    if [[ -n "${FIND_FILE_DB}" ]]; then
         RESTORE_FILE_DB="extract/${FIND_FILE_DB}"
     fi
 
     # get restore config file
     RESTORE_FILE_CONFIG=""
     FIND_FILE_CONFIG="$( basename "$(ls ${RESTORE_EXTRACT_DIR}/config.*.json)" )"
-    if [[ "${FIND_FILE_CONFIG}" ]]; then
+    if [[ -n "${FIND_FILE_CONFIG}" ]]; then
         RESTORE_FILE_CONFIG="extract/${FIND_FILE_CONFIG}"
     fi
 
     # get restore attachments file
     RESTORE_FILE_ATTACHMENTS=""
     FIND_FILE_ATTACHMENTS="$( basename "$(ls ${RESTORE_EXTRACT_DIR}/attachments.*.tar)" )"
-    if [[ "${FIND_FILE_ATTACHMENTS}" ]]; then
+    if [[ -n "${FIND_FILE_ATTACHMENTS}" ]]; then
         RESTORE_FILE_ATTACHMENTS="extract/${FIND_FILE_ATTACHMENTS}"
     fi
 
@@ -102,7 +102,7 @@ function check_restore_file_exist() {
 }
 
 function restore_file() {
-    if [[ "${RESTORE_FILE_ZIP}" ]]; then
+    if [[ -n "${RESTORE_FILE_ZIP}" ]]; then
         check_restore_file_exist "${RESTORE_FILE_ZIP}" "--zip-file"
 
         RESTORE_FILE_ZIP="${RESTORE_DIR}/${RESTORE_FILE_ZIP}"
@@ -111,31 +111,31 @@ function restore_file() {
         restore_zip
         clear_extract_dir
     else
-        if [[ "${RESTORE_FILE_DB}" ]]; then
+        if [[ -n "${RESTORE_FILE_DB}" ]]; then
             check_restore_file_exist "${RESTORE_FILE_DB}" "--db-file"
 
             RESTORE_FILE_DB="${RESTORE_DIR}/${RESTORE_FILE_DB}"
         fi
 
-        if [[ "${RESTORE_FILE_CONFIG}" ]]; then
+        if [[ -n "${RESTORE_FILE_CONFIG}" ]]; then
             check_restore_file_exist "${RESTORE_FILE_CONFIG}" "--config-file"
 
             RESTORE_FILE_CONFIG="${RESTORE_DIR}/${RESTORE_FILE_CONFIG}"
         fi
 
-        if [[ "${RESTORE_FILE_ATTACHMENTS}" ]]; then
+        if [[ -n "${RESTORE_FILE_ATTACHMENTS}" ]]; then
             check_restore_file_exist "${RESTORE_FILE_ATTACHMENTS}" "--attachments-file"
 
             RESTORE_FILE_ATTACHMENTS="${RESTORE_DIR}/${RESTORE_FILE_ATTACHMENTS}"
         fi
 
-        if [[ "${RESTORE_FILE_DB}" ]]; then
+        if [[ -n "${RESTORE_FILE_DB}" ]]; then
             restore_db
         fi
-        if [[ "${RESTORE_FILE_CONFIG}" ]]; then
+        if [[ -n "${RESTORE_FILE_CONFIG}" ]]; then
             restore_config
         fi
-        if [[ "${RESTORE_FILE_ATTACHMENTS}" ]]; then
+        if [[ -n "${RESTORE_FILE_ATTACHMENTS}" ]]; then
             restore_attachments
         fi
     fi