diff --git a/usr/lib/tbbversion_parser b/usr/lib/tbbversion_parser index cb43192..39a4e45 100755 --- a/usr/lib/tbbversion_parser +++ b/usr/lib/tbbversion_parser @@ -108,6 +108,9 @@ Either check.torproject.org has been compromised or this is a Whonix bug." fi ## }} parsing old format + ## https://trac.torproject.org/projects/tor/ticket/29936#comment:5 + temp="$(echo "$temp" | sed 's/"//g')" + tbbversions_found="$(( $tbbversions_found + 1 ))" if [ "$tbb_recommended_versions_list" = "UNKNOWN" ]; then diff --git a/usr/share/tb-updater/unit-test/RecommendedTBBVersions2 b/usr/share/tb-updater/unit-test/RecommendedTBBVersions2 new file mode 100644 index 0000000..7a2ba59 --- /dev/null +++ b/usr/share/tb-updater/unit-test/RecommendedTBBVersions2 @@ -0,0 +1,10 @@ + [ +"8.0.8", +"8.0.8-MacOS", +"8.0.8-Linux", +"8.0.8-Windows", +"8.5a10", +"8.5a10-MacOS", +"8.5a10-Linux", +"8.5a10-Windows" +] diff --git a/usr/share/tb-updater/unit_test b/usr/share/tb-updater/unit_test index 00753b6..e376dc4 100755 --- a/usr/share/tb-updater/unit_test +++ b/usr/share/tb-updater/unit_test @@ -8,16 +8,19 @@ cd .. cd .. cd .. -RecommendedTBBVersions="./usr/share/tb-updater/unit-test/RecommendedTBBVersions" - -test -f "$RecommendedTBBVersions" - source ./usr/lib/tbbversion_parser -tbbversion +for RecommendedTBBVersions in ./usr/share/tb-updater/unit-test/RecommendedTBBVersions ./usr/share/tb-updater/unit-test/RecommendedTBBVersions2 ; do + test -f "$RecommendedTBBVersions" -echo "tbb_recommended_versions_list: $tbb_recommended_versions_list" + tbbversion -for tbb_version in $tbb_recommended_versions_list; do - echo "tbb_version: $tbb_version" + echo "tbb_recommended_versions_list: $tbb_recommended_versions_list" + + for tbb_version in $tbb_recommended_versions_list; do + echo "tbb_version: $tbb_version" + done + echo "----------" done + +echo "OK"