Merge pull request #155 from 007revad/main

Sync from main

CHANGES.txt

@@ -1,3 +1,6 @@
+v3.1.65
+- Bug fix for NVMe drives with / in the model name for non-device tree Synology models. Issue #154
+
 v3.1.64
 - Added -e --email option to disable coloured output to make task scheduler emails easier to read.
 - Bug fix for script not updating itself if .sh file had been renamed.
@@ -10,7 +13,7 @@ v3.1.63
 - Added support to disable unsupported memory warnings on DVA models. #136
 
 v3.1.62
-- Fixed bug where newly connected expansion units weren't found until up to 24 hours later. #124
+- Fixed bug where newly connected expansion units weren't found until up to 24 hours later. Issue #124
 
 v3.1.61
 - Added enabling E10M20-T1, M2D20 and M2D18 for DS1821+, DS1621+ and DS1520+.

syno_hdd_db.sh

@@ -29,6 +29,8 @@
 # Change how synoinfo.conf is backed up and restored to prevent issue #73
 
 # DONE
+# Bug fix for NVMe drives with / in the model name for non-device tree Synology models.
+#
 # Bug fix for script not updating itself if .sh file had been renamed.
 #
 # Bug fix for missing executable permissions if .sh file had been renamed.
@@ -218,7 +220,7 @@
 # Optionally disable "support_disk_compatibility".
 
 
-scriptver="v3.1.64"
+scriptver="v3.1.65"
 script=Synology_HDD_db
 repo="007revad/Synology_HDD_db"
 
@@ -1159,7 +1161,8 @@ updatedb(){
             # example:
             # {"success":1,"list":[{"model":"WD60EFRX-68MYMN1","firmware":"82.00A82","rec_intvl":[1]},
             #if sed -i "s/$startstring/$startstring$string/" "$2"; then
-            if sed -i "s/${startstring//\//\\/}/${startstring//\//\\/}$string/" "$2"; then
+            #if sed -i "s/${startstring//\//\\/}/${startstring//\//\\/}$string/" "$2"; then
+            if sed -i "s/$startstring/$startstring${string//\//\\/}/" "$2"; then
                 echo -e "Added ${Yellow}$hdmodel${Off} to ${Cyan}$(basename -- "$2")${Off}"
             else
                 ding