X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=tor-browser;h=f9a6e45bbf2c7faac604fc72810ce0e6d6d9a1a5;hb=e9edd7a5ab77873f24bad49348f4a6cdf7668277;hp=7da0ebea028585471a3eadace318322ff315a8dd;hpb=d94b08eaf07f80899b1a1949c8c03dd84f425379;p=buildscripts

diff --git a/tor-browser b/tor-browser
index 7da0ebe..f9a6e45 100755
--- a/tor-browser
+++ b/tor-browser
@@ -19,9 +19,14 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
 
 # stable version is shown on:
 # https://dist.torproject.org/torbrowser/
+# except sometimes you get a new stable before it's
+# officially released, which is ok by me. for example,
+# right now, it has 6.5.2, but stable is 6.5.1.
+# we exclude verions with letters, as that seems to
+# be a relatively reliable indication of alpha/beta releases.
 
 ver=$(curl -s https://dist.torproject.org/torbrowser/ \
-          | sed -rn 's/.*href="([0-9]+\.[0-9]+\.[0-9]+).*/\1/p' \
+          | sed -rn 's#.*href="([0-9]+\.[0-9]+[.0-9]*)/.*#\1#p' \
           | sort -Vr | head -n 1)
 
 
@@ -30,14 +35,14 @@ ver=$(curl -s https://dist.torproject.org/torbrowser/ \
 cd /a/opt
 
 f=tor-browser-linux64-${ver}_en-US.tar.xz
-timestamp=$(stat -c %Y $f)
+timestamp=$(stat -c %Y $f) ||:
 wget -N https://www.torproject.org/dist/torbrowser/$ver/$f
-if [[ $timestamp == $(stat -c %Y $f) && -e /a/opt/tor-browser_en-US/Browser/start-tor-browser ]]; then
-    # already installed
-    exit 0
+new_timestamp=$(stat -c %Y $f) ||:
+if [[ $timestamp != $new_timestamp || ! -e /a/opt/tor-browser_en-US/Browser/start-tor-browser ]]; then
+   # not already installed
+    rm -rf tor-browser_en-US
+    ex $f
 fi
-rm -rf tor-browser_en-US
-ex $f
 
 for x in tor-*.tar.xz; do
     # cleanup old tarballs