From ba20386e65a91d23f1a5b52c58989a2fe1328dd2 Mon Sep 17 00:00:00 2001
From: "dave@tiredofit.ca" <dave@tiredofit.ca>
Date: Thu, 23 Jun 2022 08:18:08 -0700
Subject: [PATCH] Release 3.3.6 - See CHANGELOG.md

---
 CHANGELOG.md                  |  6 ++++++
 install/usr/local/bin/restore | 24 ++++++++++++------------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 828b0f6..c3d616a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 3.3.6 2022-06-23 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix for restore script when using all 7 arguments
+
+
 ## 3.3.5 2022-06-08 <dave at tiredofit dot ca>
 
    ### Changed
diff --git a/install/usr/local/bin/restore b/install/usr/local/bin/restore
index 007b187..0c1de9f 100755
--- a/install/usr/local/bin/restore
+++ b/install/usr/local/bin/restore
@@ -852,11 +852,11 @@ fi
 print_debug "Database Host '${r_dbhost}'"
 
 ## Question Database Name
-if [ -n "${3}" ]; then
-    if [ ! -f "${3}" ]; then
+if [ -n "${4}" ]; then
+    if [ ! -f "${4}" ]; then
         get_dbname
     else
-        r_dbname="${3}"
+        r_dbname="${4}"
     fi
 else
     get_dbname
@@ -864,11 +864,11 @@ fi
 print_debug "Database Name '${r_dbname}'"
 
 ## Question Database User
-if [ -n "${4}" ]; then
-    if [ ! -f "${4}" ]; then
+if [ -n "${5}" ]; then
+    if [ ! -f "${5}" ]; then
         get_dbuser
     else
-        r_dbuser="${4}"
+        r_dbuser="${5}"
     fi
 else
     get_dbuser
@@ -876,11 +876,11 @@ fi
 print_debug "Database User '${r_dbuser}'"
 
 ## Question Database Password
-if [ -n "${5}" ]; then
-    if [ ! -f "${5}" ]; then
+if [ -n "${6}" ]; then
+    if [ ! -f "${6}" ]; then
         get_dbpass
     else
-        r_dbpass="${5}"
+        r_dbpass="${6}"
     fi
 else
     get_dbpass
@@ -888,11 +888,11 @@ fi
 print_debug "Database Pass '${r_dbpass}'"
 
 ## Question Database Port
-if [ -n "${6}" ]; then
-    if [ ! -f "${6}" ]; then
+if [ -n "${7}" ]; then
+    if [ ! -f "${7}" ]; then
         get_dbport
     else
-        r_dbport="${6}"
+        r_dbport="${7}"
     fi
 else
     get_dbport