From 5ae3a020bd056bd5e595c0c0bd3cef57754c974a Mon Sep 17 00:00:00 2001
From: John Elliott <johnelliott703@gmail.com>
Date: Fri, 4 Feb 2022 18:25:02 -0800
Subject: [PATCH 1/3] Add err log for missing oathtool in Synology

Alerts the user that the oathtool is missing and the TOTP can't be
generated.
---
 deploy/synology_dsm.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/deploy/synology_dsm.sh b/deploy/synology_dsm.sh
index 66e28f93..3ef243ca 100644
--- a/deploy/synology_dsm.sh
+++ b/deploy/synology_dsm.sh
@@ -94,6 +94,11 @@ synology_dsm_deploy() {
 
   otp_code=""
   if [ -n "$SYNO_TOTP_SECRET" ]; then
+    if ! command -v oathtool &> /dev/null
+    then
+      _err "oathtool could not be found, install oathtool to use SYNO_TOTP_SECRET"
+      exit 1
+    fi
     otp_code="$(oathtool --base32 --totp "${SYNO_TOTP_SECRET}" 2>/dev/null)"
   fi
 

From 5ce8050e46202c1f2466a1714794a664358a983e Mon Sep 17 00:00:00 2001
From: John Elliott <johnelliott703@gmail.com>
Date: Mon, 7 Feb 2022 11:55:55 -0800
Subject: [PATCH 2/3] Update missing oathtool check

---
 deploy/synology_dsm.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/deploy/synology_dsm.sh b/deploy/synology_dsm.sh
index 3ef243ca..29e7de65 100644
--- a/deploy/synology_dsm.sh
+++ b/deploy/synology_dsm.sh
@@ -94,12 +94,12 @@ synology_dsm_deploy() {
 
   otp_code=""
   if [ -n "$SYNO_TOTP_SECRET" ]; then
-    if ! command -v oathtool &> /dev/null
-    then
+    if _exists oathtool; then
+      otp_code="$(oathtool --base32 --totp "${SYNO_TOTP_SECRET}" 2>/dev/null)"
+    else
       _err "oathtool could not be found, install oathtool to use SYNO_TOTP_SECRET"
       exit 1
     fi
-    otp_code="$(oathtool --base32 --totp "${SYNO_TOTP_SECRET}" 2>/dev/null)"
   fi
 
   if [ -n "$SYNO_DID" ]; then

From 3a99a77104861c7cb24c401f99e7f3ed23033856 Mon Sep 17 00:00:00 2001
From: John Elliott <johnelliott703@gmail.com>
Date: Mon, 7 Feb 2022 21:55:12 -0800
Subject: [PATCH 3/3] Update return statement

---
 deploy/synology_dsm.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/synology_dsm.sh b/deploy/synology_dsm.sh
index 29e7de65..f30f82c0 100644
--- a/deploy/synology_dsm.sh
+++ b/deploy/synology_dsm.sh
@@ -98,7 +98,7 @@ synology_dsm_deploy() {
       otp_code="$(oathtool --base32 --totp "${SYNO_TOTP_SECRET}" 2>/dev/null)"
     else
       _err "oathtool could not be found, install oathtool to use SYNO_TOTP_SECRET"
-      exit 1
+      return 1
     fi
   fi