From bdb682b4889b237ee72280f8db9d365d5e3ed7be Mon Sep 17 00:00:00 2001
From: Dave Russell <39733752+007revad@users.noreply.github.com>
Date: Fri, 21 Apr 2023 21:22:15 +1000
Subject: [PATCH 01/11] Update syno_hdd_db.sh

- Now looks for and edits both v7 and non-v7 db files to solve issue #11 for RS '21 models running DSM 6.2.4.
---
 syno_hdd_db.sh | 154 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 95 insertions(+), 59 deletions(-)

diff --git a/syno_hdd_db.sh b/syno_hdd_db.sh
index 8197c5a..418ae98 100644
--- a/syno_hdd_db.sh
+++ b/syno_hdd_db.sh
@@ -30,6 +30,9 @@
 # It's also parsed and checked and probably in some cases it could be more critical to patch that one instead.
 
 # DONE
+# Now looks for and edits both v7 and non-v7 db files to solve issue #11 for RS '21 models running DSM 6.2.4.
+#
+#
 # Improved shell output when editing max memory setting.
 #
 # Changed method of checking if drive is a USB drive to prevent ignoring internal drives on RS models.
@@ -121,7 +124,7 @@
 # Optionally disable "support_disk_compatibility".
 
 
-scriptver="v2.1.38"
+scriptver="v2.2.39"
 script=Synology_HDD_db
 repo="007revad/Synology_HDD_db"
 
@@ -371,14 +374,14 @@ if ! printf "%s\n%s\n" "$tag" "$scriptver" |
 
                             # Delete downloaded .tar.gz file
                             if ! rm "/tmp/$script-$shorttag.tar.gz"; then
-                                delerr=1
+                                #delerr=1
                                 echo -e "${Error}ERROR ${Off} Failed to delete"\
                                     "downloaded /tmp/$script-$shorttag.tar.gz!"
                             fi
 
                             # Delete extracted tmp files
                             if ! rm -r "/tmp/$script-$shorttag"; then
-                                delerr=1
+                                #delerr=1
                                 echo -e "${Error}ERROR ${Off} Failed to delete"\
                                     "downloaded /tmp/$script-$shorttag!"
                             fi
@@ -437,7 +440,7 @@ getdriveinfo() {
     # $1 is /sys/block/sata1 etc
 
     # Skip USB drives
-    usb=$(grep $(basename -- "$1") /proc/mounts | grep usb | cut -d" " -f1-2)
+    usb=$(grep "$(basename -- "$1")" /proc/mounts | grep usb | cut -d" " -f1-2)
     if [[ ! $usb ]]; then
 
         # Get drive model and firmware version
@@ -479,12 +482,22 @@ getcardmodel() {
         cardmodel=$(synodisk --m2-card-model-get "$1")
         if [[ $cardmodel =~ M2D[0-9][0-9] ]]; then
             # M2 adaptor card
-            m2carddblist+=("${model}_${cardmodel,,}${version}.db")  # M.2 card's db file
-            m2cardlist+=("$cardmodel")                              # M.2 card
+            if [[ -f "${model}_${cardmodel,,}${version}.db" ]]; then
+                m2carddblist+=("${model}_${cardmodel,,}${version}.db")  # M.2 card's db file
+            fi
+            if [[ -f "${model}_${cardmodel,,}.db" ]]; then
+                m2carddblist+=("${model}_${cardmodel,,}.db")            # M.2 card's db file
+            fi
+            m2cardlist+=("$cardmodel")                                  # M.2 card
         elif [[ $cardmodel =~ E[0-9][0-9]+M.+ ]]; then
             # Ethernet + M2 adaptor card
-            m2carddblist+=("${model}_${cardmodel,,}${version}.db")  # M.2 card's db file
-            m2cardlist+=("$cardmodel")                              # M.2 card
+            if [[ -f "${model}_${cardmodel,,}${version}.db" ]]; then
+                m2carddblist+=("${model}_${cardmodel,,}${version}.db")  # M.2 card's db file
+            fi
+            if [[ -f "${model}_${cardmodel,,}.db" ]]; then
+                m2carddblist+=("${model}_${cardmodel,,}.db")            # M.2 card's db file
+            fi
+            m2cardlist+=("$cardmodel")                                  # M.2 card
         fi
     fi
 }
@@ -513,7 +526,7 @@ for d in /sys/block/*; do
                     getcardmodel "/dev/$(basename -- "${d}")"
 
                     # Enable creating M.2 storage pool and volume in Storage Manager
-                    echo 1 > /run/synostorage/disks/$(basename -- "$d")/m2_pool_support
+                    echo 1 > /run/synostorage/disks/"$(basename -- "$d")"/m2_pool_support
                 fi
             fi
         ;;
@@ -526,7 +539,7 @@ for d in /sys/block/*; do
                     getcardmodel "/dev/$(basename -- "${d}")"
 
                     # Enable creating M.2 storage pool and volume in Storage Manager
-                    echo 1 > /run/synostorage/disks/$(basename -- "$d")/m2_pool_support
+                    echo 1 > /run/synostorage/disks/"$(basename -- "$d")"/m2_pool_support
                 fi
             fi
         ;;
@@ -644,16 +657,19 @@ fi
 #------------------------------------------------------------------------------
 # Check databases and add our drives if needed
 
-db1="/var/lib/disk-compatibility/${model}_host${version}.db"
-db2="/var/lib/disk-compatibility/${model}_host${version}.db.new"
 dbpath="/var/lib/disk-compatibility/"
+db1list=("$(find "$dbpath" -maxdepth 1 -name "*_host*.db")")
+db2list=("$(find "$dbpath" -maxdepth 1 -name "*_host*.db.new")")
 
 synoinfo="/etc.defaults/synoinfo.conf"
 
 
-if [[ ! -f "$db1" ]]; then echo -e "${Error}ERROR 3${Off} $db1 not found!" && exit 3; fi
-#if [[ ! -f "$db2" ]]; then echo -e "${Error}ERROR 4${Off} $db2 not found!" && exit 4; fi
-# new installs don't have a .db.new file
+#if [[ ! -f "$db1" ]]; then echo -e "${Error}ERROR 3${Off} $db1 not found!" && exit 3; fi
+if [[ ${#db1list[@]} -eq "0" ]]; then
+    echo -e "${Error}ERROR 4${Off} Host db file not found!" && exit 4
+fi
+##if [[ ! -f "$db2" ]]; then echo -e "${Error}ERROR 4${Off} $db2 not found!" && exit 4; fi
+## new installs don't have a .db.new file
 
 
 getdbtype(){
@@ -689,7 +705,10 @@ backupdb() {
 
 
 # Backup host database file if needed
-backupdb "$db1" || exit 5
+#backupdb "$db1" || exit 5
+for i in "${!db2list[@]}"; do
+    backupdb "${db2list[i]}" || exit 5
+done 
 
 
 #------------------------------------------------------------------------------
@@ -697,9 +716,11 @@ backupdb "$db1" || exit 5
 
 editcount(){
     # Count drives added to host db files
-    if [[ $1 == "$db1" ]]; then
+    #if [[ $1 == "$db1" ]]; then
+    if [[ $1 =~ .*\.db$ ]]; then
         db1Edits=$((db1Edits +1))
-    elif [[ $1 == "$db2" ]]; then
+    #elif [[ $1 == "$db2" ]]; then
+    elif [[ $1 =~ .*\.db.new ]]; then
         db2Edits=$((db2Edits +1))
     fi
 }
@@ -797,11 +818,12 @@ updatedb() {
                 echo -e "Added ${Yellow}$hdmodel${Off} to ${Cyan}$(basename -- "$2")${Off}"
 
                 # Count drives added to host db files
-                if [[ $2 == "$db1" ]]; then
-                    db1Edits=$((db1Edits +1))
-                elif [[ $2 == "$db2" ]]; then
-                    db2Edits=$((db2Edits +1))
-                fi
+                #if [[ $2 == "$db1" ]]; then
+                #    db1Edits=$((db1Edits +1))
+                #elif [[ $2 == "$db2" ]]; then
+                #    db2Edits=$((db2Edits +1))
+                #fi
+                #editcount "$2"
 
             else
                 echo -e "\n${Error}ERROR 8${Off} Failed to update $(basename -- "$2")${Off}" >&2
@@ -814,10 +836,16 @@ updatedb() {
 # HDDs and SATA SSDs
 num="0"
 while [[ $num -lt "${#hdds[@]}" ]]; do
-    updatedb "${hdds[$num]}" "$db1"
-    if [[ -f "$db2" ]]; then
-        updatedb "${hdds[$num]}" "$db2"
-    fi
+    #updatedb "${hdds[$num]}" "$db1"
+    #if [[ -f "$db2" ]]; then
+    #    updatedb "${hdds[$num]}" "$db2"
+    #fi
+    for i in "${!db1list[@]}"; do
+        updatedb "${hdds[$num]}" "${db1list[i]}"
+    done
+    for i in "${!db2list[@]}"; do
+        updatedb "${hdds[$num]}" "${db2list[i]}"
+    done
 
     #------------------------------------------------
     # Expansion Units
@@ -840,10 +868,16 @@ done
 # M.2 NVMe/SATA drives
 num="0"
 while [[ $num -lt "${#nvmes[@]}" ]]; do
-    updatedb "${nvmes[$num]}" "$db1"
-    if [[ -f "$db2" ]]; then
-        updatedb "${nvmes[$num]}" "$db2"
-    fi
+    #updatedb "${hdds[$num]}" "$db1"
+    #if [[ -f "$db2" ]]; then
+    #    updatedb "${hdds[$num]}" "$db2"
+    #fi
+    for i in "${!db1list[@]}"; do
+        updatedb "${nvmes[$num]}" "$i"
+    done
+    for i in "${!db2list[@]}"; do
+        updatedb "${nvmes[$num]}" "$i"
+    done
 
     #------------------------------------------------
     # M.2 adaptor cards
@@ -1039,36 +1073,38 @@ fi
 
 # Show the changes
 if [[ ${showedits,,} == "yes" ]]; then
-    getdbtype "$db1"
-    if [[ $dbtype -gt "6" ]]; then
-        # Show 11 lines after hdmodel line
-        lines=11
-    elif [[ $dbtype -eq "6" ]]; then
-        # Show 2 lines after hdmodel line
-        lines=2
-    fi
+    for i in "${!db1list[@]}"; do
+        getdbtype "$i"
+        if [[ $dbtype -gt "6" ]]; then
+            # Show 11 lines after hdmodel line
+            lines=11
+        elif [[ $dbtype -eq "6" ]]; then
+            # Show 2 lines after hdmodel line
+            lines=2
+        fi
 
-    # HDDs/SSDs
-    if [[ ${#hdds[@]} -gt "0" ]]; then
-        num="0"
-        while [[ $num -lt "${#hdds[@]}" ]]; do
-            hdmodel=$(printf "%s" "${hdds[$num]}" | cut -d"," -f 1)
-            echo
-            jq . "$db1" | grep -A "$lines" "$hdmodel"
-            num=$((num +1))
-        done
-    fi
+        # HDDs/SSDs
+        if [[ ${#hdds[@]} -gt "0" ]]; then
+            num="0"
+            while [[ $num -lt "${#hdds[@]}" ]]; do
+                hdmodel=$(printf "%s" "${hdds[$num]}" | cut -d"," -f 1)
+                echo
+                jq . "$i" | grep -A "$lines" "$hdmodel"
+                num=$((num +1))
+            done
+        fi
 
-    # NVMe drives
-    if [[ ${#nvmes[@]} -gt "0" ]]; then
-        num="0"
-        while [[ $num -lt "${#nvmes[@]}" ]]; do
-            nvmemodel=$(printf "%s" "${nvmes[$num]}" | cut -d"," -f 1)
-            echo
-            jq . "$db1" | grep -A "$lines" "$nvmemodel"
-            num=$((num +1))
-        done
-    fi
+        # NVMe drives
+        if [[ ${#nvmes[@]} -gt "0" ]]; then
+            num="0"
+            while [[ $num -lt "${#nvmes[@]}" ]]; do
+                nvmemodel=$(printf "%s" "${nvmes[$num]}" | cut -d"," -f 1)
+                echo
+                jq . "$i" | grep -A "$lines" "$nvmemodel"
+                num=$((num +1))
+            done
+        fi
+    done
 
 fi
 

From 6d35581453f32967c68de9feaaf1028826c4b1e1 Mon Sep 17 00:00:00 2001
From: Dave Russell <39733752+007revad@users.noreply.github.com>
Date: Fri, 21 Apr 2023 21:22:54 +1000
Subject: [PATCH 02/11] Update CHANGES.txt

- Now looks for and edits both v7 and non-v7 db files to solve issue #11 for RS '21 models running DSM 6.2.4.
---
 CHANGES.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 8af37d1..9603241 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,6 @@
+v2.2.39
+- Now looks for and edits both v7 and non-v7 db files to solve issue #11 for RS '21 models running DSM 6.2.4.
+
 v2.1.38
 - Improved shell output when editing max memory setting.
 - Changed method of checking if drive is a USB drive to prevent ignoring internal drives on RS models.

From 99e513c621cf34502ce0c22996be994498a13df6 Mon Sep 17 00:00:00 2001
From: Dave Russell <39733752+007revad@users.noreply.github.com>
Date: Sun, 23 Apr 2023 15:45:41 +1000
Subject: [PATCH 03/11] Update syno_hdd_db.sh

- Now looks for and edits both v7 and non-v7 db files to solve issue #11 for RS '21 models running DSM 6.2.4. This will also ensure the script still works if:
    - Synology append different numbers to the db file names in DSM 8 etc.
    - The detected NAS model name does not match the .db files' model name.
- Now backs up the .db.new files (as well as the .db files).
- Now shows max memory in GB instead of MB.
- Now shows status of "Support disk compatibility" setting even if it wasn't changed.
- Now shows status of "Support memory compatibility" setting even if it wasn't changed.
---
 syno_hdd_db.sh | 179 ++++++++++++++++++++++++-------------------------
 1 file changed, 86 insertions(+), 93 deletions(-)

diff --git a/syno_hdd_db.sh b/syno_hdd_db.sh
index 418ae98..699753e 100644
--- a/syno_hdd_db.sh
+++ b/syno_hdd_db.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# shellcheck disable=SC1083,SC2054,SC2121
+# shellcheck disable=SC1083,SC2054,SC2121,SC2207
 #--------------------------------------------------------------------------------------------------
 # Github: https://github.com/007revad/Synology_HDD_db
 # Script verified at https://www.shellcheck.net/
@@ -31,6 +31,17 @@
 
 # DONE
 # Now looks for and edits both v7 and non-v7 db files to solve issue #11 for RS '21 models running DSM 6.2.4.
+# This will also ensure the script still works if:
+#     Synology append different numbers to the db file names in DSM 8 etc.
+#     The detected NAS model name does not match the .db files' model name.
+#
+# Now backs up the .db.new files (as well as the .db files).
+#
+# Now shows max memory in GB instead of MB.
+#
+# Now shows status of "Support disk compatibility" setting even if it wasn't changed.
+#
+# Now shows status of "Support memory compatibility" setting even if it wasn't changed.
 #
 #
 # Improved shell output when editing max memory setting.
@@ -174,7 +185,7 @@ EOF
 
 
 # Save options used
-args="$@"
+args="$*"
 
 
 # Check for flags with getopt
@@ -374,14 +385,12 @@ if ! printf "%s\n%s\n" "$tag" "$scriptver" |
 
                             # Delete downloaded .tar.gz file
                             if ! rm "/tmp/$script-$shorttag.tar.gz"; then
-                                #delerr=1
                                 echo -e "${Error}ERROR ${Off} Failed to delete"\
                                     "downloaded /tmp/$script-$shorttag.tar.gz!"
                             fi
 
                             # Delete extracted tmp files
                             if ! rm -r "/tmp/$script-$shorttag"; then
-                                #delerr=1
                                 echo -e "${Error}ERROR ${Off} Failed to delete"\
                                     "downloaded /tmp/$script-$shorttag!"
                             fi
@@ -531,7 +540,6 @@ for d in /sys/block/*; do
             fi
         ;;
         nvc*)  # M.2 SATA drives (in PCIe card only?)
-            #if [[ $d =~ nvc[0-9][0-9]?p[0-9][0-9]?$ ]]; then
             if [[ $d =~ nvc[0-9][0-9]?$ ]]; then
                 if [[ $m2 != "no" ]]; then
                     getm2info "$d" "nvc"
@@ -629,7 +637,6 @@ fi
 path="/var/log/diskprediction"
 # shellcheck disable=SC2012
 file=$(ls $path | tail -n1) 
-# shellcheck disable=SC2207
 eunitlist=($(grep -Eow "([FRD]XD?[0-9]{3,4})(RP|II|sas){0,2}" "$path/$file" | uniq))
 
 # Sort eunitlist array into new eunits array to remove duplicates
@@ -658,18 +665,30 @@ fi
 # Check databases and add our drives if needed
 
 dbpath="/var/lib/disk-compatibility/"
-db1list=("$(find "$dbpath" -maxdepth 1 -name "*_host*.db")")
-db2list=("$(find "$dbpath" -maxdepth 1 -name "*_host*.db.new")")
+
+# Host db files
+db1list=($(find "$dbpath" -maxdepth 1 -name "*_host*.db"))
+db2list=($(find "$dbpath" -maxdepth 1 -name "*_host*.db.new"))
+
+# Expansion Unit db files
+for i in "${!eunits[@]}"; do
+    eunitdb1list=($(find "$dbpath" -maxdepth 1 -name "${eunits[i],,}*.db"))
+    eunitdb2list=($(find "$dbpath" -maxdepth 1 -name "${eunits[i],,}*.db.new"))
+done
+
+# M.2 Card db files
+for i in "${!m2cards[@]}"; do
+    m2carddb1list=($(find "$dbpath" -maxdepth 1 -name "*_${m2cards[i],,}*.db"))
+    m2carddb2list=($(find "$dbpath" -maxdepth 1 -name "*_${m2cards[i],,}*.db.new"))
+done
 
 synoinfo="/etc.defaults/synoinfo.conf"
 
 
-#if [[ ! -f "$db1" ]]; then echo -e "${Error}ERROR 3${Off} $db1 not found!" && exit 3; fi
 if [[ ${#db1list[@]} -eq "0" ]]; then
     echo -e "${Error}ERROR 4${Off} Host db file not found!" && exit 4
 fi
-##if [[ ! -f "$db2" ]]; then echo -e "${Error}ERROR 4${Off} $db2 not found!" && exit 4; fi
-## new installs don't have a .db.new file
+# Don't check .db.new as new installs don't have a .db.new file
 
 
 getdbtype(){
@@ -705,10 +724,18 @@ backupdb() {
 
 
 # Backup host database file if needed
-#backupdb "$db1" || exit 5
+for i in "${!db1list[@]}"; do
+    backupdb "${db1list[i]}" ||{
+        echo -e "${Error}ERROR 5${Off} Failed to backup $(basename -- "${db1list[i]}")!"
+        exit 5
+        }
+done
 for i in "${!db2list[@]}"; do
-    backupdb "${db2list[i]}" || exit 5
-done 
+    backupdb "${db2list[i]}" ||{
+        echo -e "${Error}ERROR 5${Off} Failed to backup $(basename -- "${db2list[i]}")!"
+        exit 5  # maybe don't exit for .db.new file
+        }
+done
 
 
 #------------------------------------------------------------------------------
@@ -716,10 +743,8 @@ done
 
 editcount(){
     # Count drives added to host db files
-    #if [[ $1 == "$db1" ]]; then
     if [[ $1 =~ .*\.db$ ]]; then
         db1Edits=$((db1Edits +1))
-    #elif [[ $1 == "$db2" ]]; then
     elif [[ $1 =~ .*\.db.new ]]; then
         db2Edits=$((db2Edits +1))
     fi
@@ -785,17 +810,17 @@ updatedb() {
 
             if grep '"disk_compatbility_info":{}' "$2" >/dev/null; then
                # Replace  "disk_compatbility_info":{}  with  "disk_compatbility_info":{"WD40PURX-64GVNY0":{"80.00A80":{ ... }}},"default":{ ... }}}}
-                echo "Edit empty db file"
+                #echo "Edit empty db file:"  # debug
                 editdb7 "empty" "$2"
 
             elif grep '"'"$hdmodel"'":' "$2" >/dev/null; then
                # Replace  "WD40PURX-64GVNY0":{  with  "WD40PURX-64GVNY0":{"80.00A80":{ ... }}},
-                echo "Insert firmware version"
+                #echo "Insert firmware version:"  # debug
                 editdb7 "insert" "$2"
 
             else
                # Add  "WD40PURX-64GVNY0":{"80.00A80":{ ... }}},"default":{ ... }}}
-                echo "Append drive and firmware"
+                #echo "Append drive and firmware:"  # debug
                 editdb7 "append" "$2"
             fi
 
@@ -807,24 +832,10 @@ updatedb() {
             string="{\"model\":\"${hdmodel}\",\"firmware\":\"\",\"rec_intvl\":\[1\]},"
             # {"success":1,"list":[
             startstring="{\"success\":1,\"list\":\["
-
-            #echo "$startstring" >&2  # debug
-            #echo "$string" >&2       # debug
-            #echo >&2                 # debug
-
             # example:
             # {"success":1,"list":[{"model":"WD60EFRX-68MYMN1","firmware":"82.00A82","rec_intvl":[1]},
             if sed -ir "s/$startstring/$startstring$string/" "$2"; then
                 echo -e "Added ${Yellow}$hdmodel${Off} to ${Cyan}$(basename -- "$2")${Off}"
-
-                # Count drives added to host db files
-                #if [[ $2 == "$db1" ]]; then
-                #    db1Edits=$((db1Edits +1))
-                #elif [[ $2 == "$db2" ]]; then
-                #    db2Edits=$((db2Edits +1))
-                #fi
-                #editcount "$2"
-
             else
                 echo -e "\n${Error}ERROR 8${Off} Failed to update $(basename -- "$2")${Off}" >&2
                 exit 8
@@ -836,10 +847,6 @@ updatedb() {
 # HDDs and SATA SSDs
 num="0"
 while [[ $num -lt "${#hdds[@]}" ]]; do
-    #updatedb "${hdds[$num]}" "$db1"
-    #if [[ -f "$db2" ]]; then
-    #    updatedb "${hdds[$num]}" "$db2"
-    #fi
     for i in "${!db1list[@]}"; do
         updatedb "${hdds[$num]}" "${db1list[i]}"
     done
@@ -849,16 +856,13 @@ while [[ $num -lt "${#hdds[@]}" ]]; do
 
     #------------------------------------------------
     # Expansion Units
-    num2="0"
-    while [[ $num2 -lt "${#eunits[@]}" ]]; do
-        eudb="${dbpath}${eunits[$num2],,}${version}.db"
-        if [[ -f "$eudb" ]]; then
-            backupdb "$eudb" &&\
-                updatedb "${hdds[$num]}" "$eudb"
-        else
-            echo -e "${Error}ERROR 11${Off} $eudb not found!"
-        fi
-        num2=$((num2 +1))
+    for i in "${!eunitdb1list[@]}"; do
+        backupdb "${eunitdb1list[i]}" &&\
+            updatedb "${hdds[$num]}" "${eunitdb1list[i]}"
+    done
+    for i in "${!eunitdb2list[@]}"; do
+        backupdb "${eunitdb2list[i]}" &&\
+            updatedb "${hdds[$num]}" "${eunitdb2list[i]}"
     done
     #------------------------------------------------
 
@@ -868,28 +872,22 @@ done
 # M.2 NVMe/SATA drives
 num="0"
 while [[ $num -lt "${#nvmes[@]}" ]]; do
-    #updatedb "${hdds[$num]}" "$db1"
-    #if [[ -f "$db2" ]]; then
-    #    updatedb "${hdds[$num]}" "$db2"
-    #fi
     for i in "${!db1list[@]}"; do
-        updatedb "${nvmes[$num]}" "$i"
+        updatedb "${nvmes[$num]}" "${db1list[i]}"
     done
     for i in "${!db2list[@]}"; do
-        updatedb "${nvmes[$num]}" "$i"
+        updatedb "${nvmes[$num]}" "${db2list[i]}"
     done
 
     #------------------------------------------------
     # M.2 adaptor cards
-    num2="0"
-    while [[ $num2 -lt "${#m2carddbs[@]}" ]]; do
-        if [[ -f "${dbpath}${m2carddbs[$num2]}" ]]; then
-            backupdb "${dbpath}${m2carddbs[$num2]}" &&\
-                updatedb "${nvmes[$num]}" "${dbpath}${m2carddbs[$num2]}"
-        else
-            echo -e "${Error}ERROR 10${Off} ${m2carddbs[$num2]} not found!"
-        fi
-        num2=$((num2 +1))
+    for i in "${!m2carddb1list[@]}"; do
+        backupdb "${m2carddb1list[i]}" &&\
+            updatedb "${nvmes[$num]}" "${m2carddb1list[i]}"
+    done
+    for i in "${!m2carddb2list[@]}"; do
+        backupdb "${m2carddb2list[i]}" &&\
+            updatedb "${nvmes[$num]}" "${m2carddb2list[i]}"
     done
     #------------------------------------------------
 
@@ -909,22 +907,24 @@ setting="$(get_key_value $synoinfo $sdc)"
 if [[ $force == "yes" ]]; then
     if [[ $setting == "yes" ]]; then
         # Disable support_disk_compatibility
-        #sed -i "s/${sdc}=\"yes\"/${sdc}=\"no\"/" "$synoinfo"
         synosetkeyvalue "$synoinfo" "$sdc" "no"
         setting="$(get_key_value "$synoinfo" $sdc)"
         if [[ $setting == "no" ]]; then
             echo -e "\nDisabled support disk compatibility."
         fi
+    elif [[ $setting == "no" ]]; then
+        echo -e "\nSupport disk compatibility already disabled."
     fi
 else
     if [[ $setting == "no" ]]; then
         # Enable support_disk_compatibility
-        #sed -i "s/${sdc}=\"no\"/${sdc}=\"yes\"/" "$synoinfo"
         synosetkeyvalue "$synoinfo" "$sdc" "yes"
         setting="$(get_key_value "$synoinfo" $sdc)"
         if [[ $setting == "yes" ]]; then
             echo -e "\nRe-enabled support disk compatibility."
         fi
+    elif [[ $setting == "yes" ]]; then
+        echo -e "\nSupport disk compatibility already enabled."
     fi
 fi
 
@@ -935,26 +935,28 @@ setting="$(get_key_value $synoinfo $smc)"
 if [[ $ram == "yes" ]]; then
     if [[ $setting == "yes" ]]; then
         # Disable support_memory_compatibility
-        #sed -i "s/${smc}=\"yes\"/${smc}=\"no\"/" "$synoinfo"
         synosetkeyvalue "$synoinfo" "$smc" "no"
         setting="$(get_key_value "$synoinfo" $smc)"
         if [[ $setting == "no" ]]; then
             echo -e "\nDisabled support memory compatibility."
         fi
+    elif [[ $setting == "no" ]]; then
+        echo -e "\nSupport memory compatibility already disabled."
     fi
 else
     if [[ $setting == "no" ]]; then
         # Enable support_memory_compatibility
-        #sed -i "s/${smc}=\"no\"/${smc}=\"yes\"/" "$synoinfo"
         synosetkeyvalue "$synoinfo" "$smc" "yes"
         setting="$(get_key_value "$synoinfo" $smc)"
         if [[ $setting == "yes" ]]; then
             echo -e "\nRe-enabled support memory compatibility."
         fi
+    elif [[ $setting == "yes" ]]; then
+        echo -e "\nSupport memory compatibility already enabled."
     fi
 fi
 
-# Optioanlly set mem_max_mb to the amount of installed memory
+# Optionally set mem_max_mb to the amount of installed memory
 if [[ $ram == "yes" ]]; then
     # Get total amount of installed memory
     IFS=$'\n' read -r -d '' -a array < <(dmidecode -t memory | grep -i 'size')
@@ -982,7 +984,9 @@ if [[ $ram == "yes" ]]; then
             echo -e "\n${Error}ERROR${Off} Failed to change max memory!"
         fi
     elif [[ $setting == "$ramtotal" ]]; then
-        echo -e "\nMax memory already set to $ramtotal MB."
+        #echo -e "\nMax memory already set to $ramtotal MB."
+        ramgb=$((ramtotal / 1024))
+        echo -e "\nMax memory already set to $ramgb GB."
     fi
 fi
 
@@ -1000,7 +1004,6 @@ if [[ $m2 != "no" ]]; then
             enabled="yes"
         elif [[ $setting == "no" ]]; then
             # Change support_m2_pool="no" to "yes"
-            #sed -i "s/${smp}=\"no\"/${smp}=\"yes\"/" "$synoinfo"
             synosetkeyvalue "$synoinfo" "$smp" "yes"
             enabled="yes"
         elif [[ $setting == "yes" ]]; then
@@ -1031,7 +1034,6 @@ if [[ $nodbupdate == "yes" ]]; then
         disabled="yes"
     elif [[ $url != "127.0.0.1" ]]; then
         # Edit drive_db_test_url=
-        #sed -i "s/drive_db_test_url=.*/drive_db_test_url=\"127.0.0.1\"/" "$synoinfo" >/dev/null
         synosetkeyvalue "$synoinfo" "$dtu" "127.0.0.1"
         disabled="yes"
     fi
@@ -1052,7 +1054,6 @@ else
     #if [[ $url == "127.0.0.1" ]]; then
     if [[ $url ]]; then
         # Delete "drive_db_test_url=127.0.0.1" line (inc. line break)
-        #sed -i "/drive_db_test_url=\"127.0.0.1\"/d" "/etc.defaults/synoinfo.conf"
         sed -i "/drive_db_test_url=*/d" "/etc.defaults/synoinfo.conf"
 
         # Check if we re-enabled drive db auto updates
@@ -1073,8 +1074,8 @@ fi
 
 # Show the changes
 if [[ ${showedits,,} == "yes" ]]; then
-    for i in "${!db1list[@]}"; do
-        getdbtype "$i"
+    if [[ ${#db1list[@]} -gt "0" ]]; then
+        getdbtype "${db1list[0]}"
         if [[ $dbtype -gt "6" ]]; then
             # Show 11 lines after hdmodel line
             lines=11
@@ -1084,28 +1085,19 @@ if [[ ${showedits,,} == "yes" ]]; then
         fi
 
         # HDDs/SSDs
-        if [[ ${#hdds[@]} -gt "0" ]]; then
-            num="0"
-            while [[ $num -lt "${#hdds[@]}" ]]; do
-                hdmodel=$(printf "%s" "${hdds[$num]}" | cut -d"," -f 1)
-                echo
-                jq . "$i" | grep -A "$lines" "$hdmodel"
-                num=$((num +1))
-            done
-        fi
+        for i in "${!hdds[@]}"; do
+            hdmodel=$(printf "%s" "${hdds[i]}" | cut -d"," -f 1)
+            echo
+            jq . "${db1list[0]}" | grep -A "$lines" "$hdmodel"
+        done
 
         # NVMe drives
-        if [[ ${#nvmes[@]} -gt "0" ]]; then
-            num="0"
-            while [[ $num -lt "${#nvmes[@]}" ]]; do
-                nvmemodel=$(printf "%s" "${nvmes[$num]}" | cut -d"," -f 1)
-                echo
-                jq . "$i" | grep -A "$lines" "$nvmemodel"
-                num=$((num +1))
-            done
-        fi
-    done
-
+        for i in "${!nvmes[@]}"; do
+            hdmodel=$(printf "%s" "${nvmes[i]}" | cut -d"," -f 1)
+            echo
+            jq . "${db1list[0]}" | grep -A "$lines" "$hdmodel"
+        done
+    fi
 fi
 
 
@@ -1117,6 +1109,7 @@ if [[ -f /usr/syno/sbin/synostgdisk ]]; then  # DSM 6.2.3 does not have synostgd
         echo -e "\nDSM successfully checked disk compatibility."
     else
         # Ignore DSM 6.2.4 as it returns 255 for "synostgdisk --check-all-disks-compatibility"
+        # and DSM 6.2.3 and lower have no synostgdisk command
         if [[ $dsm -gt "6" ]]; then
             echo -e "\nDSM ${Red}failed${Off} to check disk compatibility with exit code $status"
             echo -e "\nYou may need to ${Cyan}reboot the Synology${Off} to see the changes."

From 57d877be8d2a4b7983e09d8d99f00d0f3fae8082 Mon Sep 17 00:00:00 2001
From: Dave Russell <39733752+007revad@users.noreply.github.com>
Date: Sun, 23 Apr 2023 15:46:31 +1000
Subject: [PATCH 04/11] Update CHANGES.txt

- Now looks for and edits both v7 and non-v7 db files to solve issue #11 for RS '21 models running DSM 6.2.4. This will also ensure the script still works if:
    - Synology append different numbers to the db file names in DSM 8 etc.
    - The detected NAS model name does not match the .db files' model name.
- Now backs up the .db.new files (as well as the .db files).
- Now shows max memory in GB instead of MB.
- Now shows status of "Support disk compatibility" setting even if it wasn't changed.
- Now shows status of "Support memory compatibility" setting even if it wasn't changed.
---
 CHANGES.txt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 9603241..49c6991 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,11 @@
 v2.2.39
-- Now looks for and edits both v7 and non-v7 db files to solve issue #11 for RS '21 models running DSM 6.2.4.
+- Now looks for and edits both v7 and non-v7 db files to solve issue #11 for RS '21 models running DSM 6.2.4. This will also ensure the script still works if:
+    - Synology append different numbers to the db file names in DSM 8 etc.
+    - The detected NAS model name does not match the .db files' model name.
+- Now backs up the .db.new files (as well as the .db files).
+- Now shows max memory in GB instead of MB.
+- Now shows status of "Support disk compatibility" setting even if it wasn't changed.
+- Now shows status of "Support memory compatibility" setting even if it wasn't changed.
 
 v2.1.38
 - Improved shell output when editing max memory setting.

From a57124c8a13a44ea15b6e85321b1fecd60d426da Mon Sep 17 00:00:00 2001
From: Dave Russell <39733752+007revad@users.noreply.github.com>
Date: Sun, 23 Apr 2023 19:28:38 +1000
Subject: [PATCH 05/11] Update CHANGES.txt

- Added a --restore option to undo all changes.
---
 CHANGES.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 49c6991..fd9c888 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,6 @@
+v2.2.40
+- Added a --restore option to undo all changes.
+
 v2.2.39
 - Now looks for and edits both v7 and non-v7 db files to solve issue #11 for RS '21 models running DSM 6.2.4. This will also ensure the script still works if:
     - Synology append different numbers to the db file names in DSM 8 etc.

From 0eaec15c123df1e9edf015bcb7301d1c30ef61e2 Mon Sep 17 00:00:00 2001
From: Dave Russell <39733752+007revad@users.noreply.github.com>
Date: Sun, 23 Apr 2023 19:31:08 +1000
Subject: [PATCH 06/11] Update syno_hdd_db.sh

-  Added a --restore option to undo all changes made by the script.
---
 syno_hdd_db.sh | 59 ++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 52 insertions(+), 7 deletions(-)

diff --git a/syno_hdd_db.sh b/syno_hdd_db.sh
index 699753e..bbe5360 100644
--- a/syno_hdd_db.sh
+++ b/syno_hdd_db.sh
@@ -30,6 +30,8 @@
 # It's also parsed and checked and probably in some cases it could be more critical to patch that one instead.
 
 # DONE
+# Added a --restore option to undo all changes.
+#
 # Now looks for and edits both v7 and non-v7 db files to solve issue #11 for RS '21 models running DSM 6.2.4.
 # This will also ensure the script still works if:
 #     Synology append different numbers to the db file names in DSM 8 etc.
@@ -135,7 +137,7 @@
 # Optionally disable "support_disk_compatibility".
 
 
-scriptver="v2.2.39"
+scriptver="v2.2.40"
 script=Synology_HDD_db
 repo="007revad/Synology_HDD_db"
 
@@ -190,14 +192,18 @@ args="$*"
 
 # Check for flags with getopt
 if options="$(getopt -o abcdefghijklmnopqrstuvwxyz0123456789 -a \
-    -l showedits,noupdate,nodbupdate,m2,force,ram,help,version,debug -- "$@")"; then
+    -l restore,showedits,noupdate,nodbupdate,m2,force,ram,help,version,debug -- "$@")"; then
     eval set -- "$options"
     while true; do
         case "${1,,}" in
+            --restore)          # Restore changes from backups
+                restore=yes
+                break
+                ;;
             -s|--showedits)     # Show edits done to host db file
                 showedits=yes
                 ;;
-            -n|--nodbupdate|--noupdate)    # Disable disk compatibility db updates
+            -n|--nodbupdate|--noupdate)  # Disable disk compatibility db updates
                 nodbupdate=yes
                 ;;
             -m|--m2)            # Don't add M.2 drives to db files
@@ -419,6 +425,49 @@ if ! printf "%s\n%s\n" "$tag" "$scriptver" |
 fi
 
 
+#------------------------------------------------------------------------------
+# Restore changes from backups
+
+dbpath=/var/lib/disk-compatibility/
+synoinfo="/etc.defaults/synoinfo.conf"
+
+if [[ $restore == "yes" ]]; then
+    dbbakfiles=($(find $dbpath -maxdepth 1 \( -name "*.db.new.bak" -o -name "*.db.bak" \)))
+    echo
+
+    if [[ ${#dbbakfiles[@]} -gt "0" ]] || [[ -f ${synoinfo}.bak ]]; then
+
+        # Restore .db files from backups
+        for f in "${!dbbakfiles[@]}"; do
+            deleteme="${dbbakfiles[f]%.bak}"  # Remove .bak
+            if mv "${dbbakfiles[f]}" "$deleteme"; then
+                echo "Restored $(basename -- "$deleteme")"
+            else
+                restoreerr=1
+                echo -e "${Error}ERROR${Off} Failed to restore $(basename -- "$deleteme")!\n"
+            fi
+        done
+
+        # Restore synoinfo.conf from backup
+        if [[ -f ${synoinfo}.bak ]]; then
+            if mv "${synoinfo}.bak" "${synoinfo}"; then
+                echo "Restored $(basename -- "$synoinfo")"
+            else
+                restoreerr=1
+                echo -e "${Error}ERROR${Off} Failed to restore synoinfo.conf!\n"
+            fi
+        fi
+
+        if [[ -z $restoreerr ]]; then
+            echo -e "\nRestore successful."
+        fi
+    else
+        echo "Nothing to restore."
+    fi
+    exit
+fi
+
+
 #------------------------------------------------------------------------------
 # Get list of installed SATA, SAS and M.2 NVMe/SATA drives,
 # PCIe M.2 cards and connected Expansion Units.
@@ -664,8 +713,6 @@ fi
 #------------------------------------------------------------------------------
 # Check databases and add our drives if needed
 
-dbpath="/var/lib/disk-compatibility/"
-
 # Host db files
 db1list=($(find "$dbpath" -maxdepth 1 -name "*_host*.db"))
 db2list=($(find "$dbpath" -maxdepth 1 -name "*_host*.db.new"))
@@ -682,8 +729,6 @@ for i in "${!m2cards[@]}"; do
     m2carddb2list=($(find "$dbpath" -maxdepth 1 -name "*_${m2cards[i],,}*.db.new"))
 done
 
-synoinfo="/etc.defaults/synoinfo.conf"
-
 
 if [[ ${#db1list[@]} -eq "0" ]]; then
     echo -e "${Error}ERROR 4${Off} Host db file not found!" && exit 4

From 9574120c2b23bd5466dd59011e09850c01e91af3 Mon Sep 17 00:00:00 2001
From: Dave Russell <39733752+007revad@users.noreply.github.com>
Date: Sun, 23 Apr 2023 19:31:40 +1000
Subject: [PATCH 07/11] Update CHANGES.txt

---
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index fd9c888..ce7337f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
 v2.2.40
-- Added a --restore option to undo all changes.
+- Added a --restore option to undo all changes made by the script.
 
 v2.2.39
 - Now looks for and edits both v7 and non-v7 db files to solve issue #11 for RS '21 models running DSM 6.2.4. This will also ensure the script still works if:

From af55b3dab3be2b53ec37fd6b81f013dbd1adb53e Mon Sep 17 00:00:00 2001
From: Dave Russell <39733752+007revad@users.noreply.github.com>
Date: Mon, 24 Apr 2023 07:42:22 +1000
Subject: [PATCH 08/11] Update syno_hdd_db.sh

- Fixed bug where expansion units ending in RP or II were not detected.
---
 syno_hdd_db.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/syno_hdd_db.sh b/syno_hdd_db.sh
index bbe5360..f70d0e4 100644
--- a/syno_hdd_db.sh
+++ b/syno_hdd_db.sh
@@ -30,6 +30,8 @@
 # It's also parsed and checked and probably in some cases it could be more critical to patch that one instead.
 
 # DONE
+# Fixed bug where expansion units ending in RP or II were not detected.
+#
 # Added a --restore option to undo all changes.
 #
 # Now looks for and edits both v7 and non-v7 db files to solve issue #11 for RS '21 models running DSM 6.2.4.
@@ -137,7 +139,7 @@
 # Optionally disable "support_disk_compatibility".
 
 
-scriptver="v2.2.40"
+scriptver="v2.2.41"
 script=Synology_HDD_db
 repo="007revad/Synology_HDD_db"
 
@@ -685,8 +687,8 @@ fi
 # Get list of connected expansion units (aka eunit/ebox)
 path="/var/log/diskprediction"
 # shellcheck disable=SC2012
-file=$(ls $path | tail -n1) 
-eunitlist=($(grep -Eow "([FRD]XD?[0-9]{3,4})(RP|II|sas){0,2}" "$path/$file" | uniq))
+file=$(ls $path | tail -n1)
+eunitlist=($(grep -Eowi "([FRD]XD?[0-9]{3,4})(rp|ii|sas){0,2}" "$path/$file" | uniq))
 
 # Sort eunitlist array into new eunits array to remove duplicates
 if [[ ${#eunitlist[@]} -gt "0" ]]; then

From bee39eaf264c5f375abbe67314938667a2d1ef6e Mon Sep 17 00:00:00 2001
From: Dave Russell <39733752+007revad@users.noreply.github.com>
Date: Mon, 24 Apr 2023 07:43:17 +1000
Subject: [PATCH 09/11] Update CHANGES.txt

---
 CHANGES.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index ce7337f..3e4dc28 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,6 @@
+v2.2.41
+- Fixed bug where expansion units ending in RP or II were not detected.
+
 v2.2.40
 - Added a --restore option to undo all changes made by the script.
 

From 19a9172ce05a31a9f078620efb568b47f5f3c127 Mon Sep 17 00:00:00 2001
From: Dave Russell <39733752+007revad@users.noreply.github.com>
Date: Mon, 24 Apr 2023 08:49:57 +1000
Subject: [PATCH 10/11] Update CHANGES.txt

---
 CHANGES.txt | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3e4dc28..df2a5f8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,10 +1,6 @@
-v2.2.41
+v2.2.42
 - Fixed bug where expansion units ending in RP or II were not detected.
-
-v2.2.40
 - Added a --restore option to undo all changes made by the script.
-
-v2.2.39
 - Now looks for and edits both v7 and non-v7 db files to solve issue #11 for RS '21 models running DSM 6.2.4. This will also ensure the script still works if:
     - Synology append different numbers to the db file names in DSM 8 etc.
     - The detected NAS model name does not match the .db files' model name.

From f47a863c7f0d84e9c085299ac794b0a6a5474e69 Mon Sep 17 00:00:00 2001
From: Dave Russell <39733752+007revad@users.noreply.github.com>
Date: Mon, 24 Apr 2023 08:50:54 +1000
Subject: [PATCH 11/11] Update syno_hdd_db.sh

- Fixed bug where expansion units ending in RP or II were not detected.
- Added a --restore option to undo all changes made by the script.
- Now looks for and edits both v7 and non-v7 db files to solve issue #11 for RS '21 models running DSM 6.2.4. This will also ensure the script still works if:
    - Synology append different numbers to the db file names in DSM 8 etc.
    - The detected NAS model name does not match the .db files' model name.
- Now backs up the .db.new files (as well as the .db files).
- Now shows max memory in GB instead of MB.
- Now shows status of "Support disk compatibility" setting even if it wasn't changed.
- Now shows status of "Support memory compatibility" setting even if it wasn't changed.
---
 syno_hdd_db.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/syno_hdd_db.sh b/syno_hdd_db.sh
index f70d0e4..cf0b986 100644
--- a/syno_hdd_db.sh
+++ b/syno_hdd_db.sh
@@ -47,7 +47,6 @@
 #
 # Now shows status of "Support memory compatibility" setting even if it wasn't changed.
 #
-#
 # Improved shell output when editing max memory setting.
 #
 # Changed method of checking if drive is a USB drive to prevent ignoring internal drives on RS models.
@@ -139,7 +138,7 @@
 # Optionally disable "support_disk_compatibility".
 
 
-scriptver="v2.2.41"
+scriptver="v2.2.42"
 script=Synology_HDD_db
 repo="007revad/Synology_HDD_db"