Merge pull request #201 from 007revad/develop

Develop

CHANGES.txt

@@ -1,8 +1,9 @@
-v3.3.75
+v3.4.76
 - Include smart_test_ignore and smart_attr_ignore in db files.
 - Now saves changes.txt as <script-filename>_changes.txt when updating the script.
     - To not overwrite changes.txt if my other scripts are in the same folder.
 - Bug fix for detecting if script is located on M.2 drive.
+- Bug fix for error when -s or --showedits option was used. Issue #200
 - Minor bug fix.
 
 v3.3.73

syno_hdd_db.sh

@@ -27,7 +27,7 @@
 # Now warns if script is located on an M.2 volume.
 
 
-scriptver="v3.3.75"
+scriptver="v3.4.76"
 script=Synology_HDD_db
 repo="007revad/Synology_HDD_db"
 scriptname=syno_hdd_db
@@ -633,6 +633,7 @@ vendor_from_id(){
     # Vendor ids missing in /usr/syno/etc.defaults/pci_vendor_ids.conf
     # $1 is vendor id
     # https://devicehunt.com/all-pci-vendors
+    # https://pci-ids.ucw.cz/
     vendor=""
     case "${1,,}" in
         0x10ec) vendor=TEAMGROUP ;;
@@ -1130,7 +1131,7 @@ updatedb(){
             default=\"default\"
             default="$default":{\"compatibility_interval\":[{\"compatibility\":\"support\",\"not_yet_rolling_status\"
             default="$default":\"support\",\"fw_dsm_update_status_notify\":false,\"barebone_installable\":true,
-            default="$default"\"smart_test_ignore\":false,\"smart_attr_ignore\":false}]}}},
+            default="$default"\"smart_test_ignore\":false,\"smart_attr_ignore\":false}]}}}
 
             if grep '"disk_compatbility_info":{}' "$2" >/dev/null; then
                 # Replace "disk_compatbility_info":{} with
@@ -1176,6 +1177,18 @@ updatedb(){
 }
 
 
+# Fix ,, instead of , bug caused by v3.3.75
+if [[ "${#db1list[@]}" -gt "0" ]]; then
+    for i in "${!db1list[@]}"; do
+        sed -i "s/,,/,/" 
+    done
+fi
+if [[ "${#db2list[@]}" -gt "0" ]]; then
+    for i in "${!db2list[@]}"; do
+        sed -i "s/,,/,/" 
+    done
+fi
+
 # HDDs and SATA SSDs
 num="0"
 while [[ $num -lt "${#hdds[@]}" ]]; do