From f0b44ffbb1501e0a2e80657c5ed49bcb32b7c3eb Mon Sep 17 00:00:00 2001 From: Dave Russell <39733752+007revad@users.noreply.github.com> Date: Fri, 29 Dec 2023 20:41:19 +1100 Subject: [PATCH 1/8] Update syno_hdd_db.sh v3.3.74 - Include smart_test_ignore and smart_attr_ignore in db files. --- 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 02bc6fa..34998f2 100644 --- a/syno_hdd_db.sh +++ b/syno_hdd_db.sh @@ -27,7 +27,7 @@ # Now warns if script is located on an M.2 volume. -scriptver="v3.3.73" +scriptver="v3.3.74" script=Synology_HDD_db repo="007revad/Synology_HDD_db" @@ -1121,11 +1121,13 @@ updatedb(){ else fwstrng=\"$fwrev\" fwstrng="$fwstrng":{\"compatibility_interval\":[{\"compatibility\":\"support\",\"not_yet_rolling_status\" - fwstrng="$fwstrng":\"support\",\"fw_dsm_update_status_notify\":false,\"barebone_installable\":true}]}, + fwstrng="$fwstrng":\"support\",\"fw_dsm_update_status_notify\":false,\"barebone_installable\":true, + fwstrng="$fwstrng"\"smart_test_ignore\":false,\"smart_attr_ignore\":false}]}, 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":\"support\",\"fw_dsm_update_status_notify\":false,\"barebone_installable\":true, + default="$default"\"smart_test_ignore\":false,\"smart_attr_ignore\":false}]}}}, if grep '"disk_compatbility_info":{}' "$2" >/dev/null; then # Replace "disk_compatbility_info":{} with From e5775b6cad2c47ec414c2985070e9223c70680ba Mon Sep 17 00:00:00 2001 From: Dave Russell <39733752+007revad@users.noreply.github.com> Date: Fri, 29 Dec 2023 20:42:00 +1100 Subject: [PATCH 2/8] Update CHANGES.txt --- CHANGES.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index da9b842..4d0eca5 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,6 @@ +v3.3.74 +- Include smart_test_ignore and smart_attr_ignore in db files. + v3.3.73 - Bug fix for vendor id. From 6f5b4f8f395c88a93adeb1b14d722d17b6fe26a5 Mon Sep 17 00:00:00 2001 From: Dave Russell <39733752+007revad@users.noreply.github.com> Date: Sat, 30 Dec 2023 12:17:51 +1100 Subject: [PATCH 3/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a925040..27f7ec0 100644 --- a/README.md +++ b/README.md @@ -126,7 +126,7 @@ ### vendor_ids.txt | | | | | |--------------------|--------------------|----------------------|----------------------| -| | Enric Escudé Santana | Yunhao Zhang | Matthias Gerhardt | +| Reece Lyne | Enric Escudé Santana | Yunhao Zhang | Matthias Gerhardt | | Darryl Harper | Mikescher | Matthias Pfaff | cpharada | | Neil Tapp | zen1605 | Kleissner Investments | Angel Scandinavia | | bcollins | Peter jackson | Mir Hekmat | Andrew Tapp | From e264668589548cb841a0069239a2c253f3669f4e Mon Sep 17 00:00:00 2001 From: Dave Russell <39733752+007revad@users.noreply.github.com> Date: Sat, 30 Dec 2023 17:21:33 +1100 Subject: [PATCH 4/8] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 27f7ec0..2cf6b62 100644 --- a/README.md +++ b/README.md @@ -124,8 +124,9 @@ ### vendor_ids.txt Thank you to the following PayPal donators, GitHub sponsors and hardware donators -| | | | | +| | | | | |--------------------|--------------------|----------------------|----------------------| +| | | | Alec Wilhere | | Reece Lyne | Enric Escudé Santana | Yunhao Zhang | Matthias Gerhardt | | Darryl Harper | Mikescher | Matthias Pfaff | cpharada | | Neil Tapp | zen1605 | Kleissner Investments | Angel Scandinavia | From 84989d254f7eabb4d9b079aa40ca7bc13f38808d Mon Sep 17 00:00:00 2001 From: Dave Russell <39733752+007revad@users.noreply.github.com> Date: Mon, 1 Jan 2024 09:09:11 +1100 Subject: [PATCH 5/8] Update README.md Updated donators list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2cf6b62..82f48fa 100644 --- a/README.md +++ b/README.md @@ -126,7 +126,7 @@ ### vendor_ids.txt | | | | | |--------------------|--------------------|----------------------|----------------------| -| | | | Alec Wilhere | +| | | Ez Hosting | Alec Wilhere | | Reece Lyne | Enric Escudé Santana | Yunhao Zhang | Matthias Gerhardt | | Darryl Harper | Mikescher | Matthias Pfaff | cpharada | | Neil Tapp | zen1605 | Kleissner Investments | Angel Scandinavia | From 903349e82ef6247ea21c440c4192c56f60c4112b Mon Sep 17 00:00:00 2001 From: Dave Russell <39733752+007revad@users.noreply.github.com> Date: Sun, 7 Jan 2024 11:36:46 +1100 Subject: [PATCH 6/8] Update syno_hdd_db.sh v3.3.75 - Now saves changes.txt as _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. - Minor bug fix. --- syno_hdd_db.sh | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/syno_hdd_db.sh b/syno_hdd_db.sh index 34998f2..a650005 100644 --- a/syno_hdd_db.sh +++ b/syno_hdd_db.sh @@ -27,9 +27,10 @@ # Now warns if script is located on an M.2 volume. -scriptver="v3.3.74" +scriptver="v3.3.75" script=Synology_HDD_db repo="007revad/Synology_HDD_db" +scriptname=syno_hdd_db # Check BASH variable is bash if [ ! "$(basename "$BASH")" = bash ]; then @@ -296,9 +297,9 @@ echo "Running from: ${scriptpath}/$scriptfile" # Warn if script located on M.2 drive scriptvol=$(echo "$scriptpath" | cut -d"/" -f2) vg=$(lvdisplay | grep /volume_"${scriptvol#volume}" | cut -d"/" -f3) -md=$(pvdisplay | grep -B 1 "$vg" | grep /dev/ | cut -d"/" -f3) +md=$(pvdisplay | grep -B 1 -E '[ ]'"$vg" | grep /dev/ | cut -d"/" -f3) if cat /proc/mdstat | grep "$md" | grep nvme >/dev/null; then - echo "${Yellow}WARNING${Off} Don't store this script on an NVMe volume!" + echo -e "${Yellow}WARNING${Off} Don't store this script on an NVMe volume!" fi @@ -381,7 +382,7 @@ if ! printf "%s\n%s\n" "$tag" "$scriptver" | fi # Copy new script sh file to script location - if ! cp -p "/tmp/$script-$shorttag/syno_hdd_db.sh" "${scriptpath}/${scriptfile}"; + if ! cp -p "/tmp/$script-$shorttag/${scriptname}.sh" "${scriptpath}/${scriptfile}"; then copyerr=1 echo -e "${Error}ERROR${Off} Failed to copy"\ @@ -410,10 +411,12 @@ if ! printf "%s\n%s\n" "$tag" "$scriptver" | fi fi - # Copy new CHANGES.txt file + # Copy new CHANGES.txt file to script location (if script on a volume) if [[ $scriptpath =~ /volume* ]]; then # Copy new CHANGES.txt file to script location - if ! cp -p "/tmp/$script-$shorttag/CHANGES.txt" "$scriptpath"; then + if ! cp -p "/tmp/$script-$shorttag/CHANGES.txt"\ + "${scriptpath}/${scriptname}_CHANGES.txt"; + then if [[ $autoupdate != "yes" ]]; then copyerr=1; fi echo -e "${Error}ERROR${Off} Failed to copy"\ "$script-$shorttag/CHANGES.txt to:\n $scriptpath" @@ -424,7 +427,7 @@ if ! printf "%s\n%s\n" "$tag" "$scriptver" | echo -e "${Error}ERROR${Off} Failed to set permissions on:" echo "$scriptpath/CHANGES.txt" fi - changestxt=", changes.txt" + changestxt=" and changes.txt" fi fi @@ -433,7 +436,7 @@ if ! printf "%s\n%s\n" "$tag" "$scriptver" | # Notify of success (if there were no errors) if [[ $copyerr != 1 ]] && [[ $permerr != 1 ]]; then - echo -e "\n$tag$changestxt$vids_txt downloaded to: ${scriptpath}\n" + echo -e "\n$tag ${scriptfile}$vids_txt$changestxt downloaded to: ${scriptpath}\n" syslog_set info "$script successfully updated to $tag" # Reload script From ce812d9b18fc9b7a8f5e7a39090ad5b1a3664c00 Mon Sep 17 00:00:00 2001 From: Dave Russell <39733752+007revad@users.noreply.github.com> Date: Sun, 7 Jan 2024 11:37:44 +1100 Subject: [PATCH 7/8] Update CHANGES.txt v3.3.75 --- CHANGES.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index 4d0eca5..988164e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,9 @@ +v3.3.75 +- Now saves changes.txt as _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. +- Minor bug fix. + v3.3.74 - Include smart_test_ignore and smart_attr_ignore in db files. From a9986b4cd8cd08edcfa47ff83c9dac5a9660088d Mon Sep 17 00:00:00 2001 From: Dave Russell <39733752+007revad@users.noreply.github.com> Date: Sun, 7 Jan 2024 11:39:25 +1100 Subject: [PATCH 8/8] Update CHANGES.txt --- CHANGES.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 988164e..a884ae9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,12 +1,10 @@ v3.3.75 +- Include smart_test_ignore and smart_attr_ignore in db files. - Now saves changes.txt as _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. - Minor bug fix. -v3.3.74 -- Include smart_test_ignore and smart_attr_ignore in db files. - v3.3.73 - Bug fix for vendor id.