Skip to content

Commit

Permalink
support version format using "
Browse files Browse the repository at this point in the history
  • Loading branch information
Patrick Schleizer committed Mar 31, 2019
1 parent a4c80e4 commit c80a423
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 8 deletions.
3 changes: 3 additions & 0 deletions usr/lib/tbbversion_parser
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions 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"
]
19 changes: 11 additions & 8 deletions usr/share/tb-updater/unit_test
Expand Up @@ -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"

0 comments on commit c80a423

Please sign in to comment.