various fixes

diff --git a/emacs b/emacs
index abab8652212101d186b9a79d5d9cc33b3397c7ba..9366f4153b3171d43721182a9915ec0534414c01 100755 (executable)
--- a/emacs
+++ b/emacs
@@ -38,7 +38,14 @@ e() { echo "$*"; "$@"; }
 export CFLAGS="-Og -g3"
 
 # gawk and attr were no longer automatically installed in stretch
-logq pi texlive hunspell git gawk attr
+extras=
+if isdebian-testing; then
+    # while this bug exists
+    # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=853970
+    # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=852611
+    extras=texlive-base/unstable
+fi
+logq pi texlive hunspell git gawk attr $extras
 case $(distro-name) in
     fedora )
         # before i learned the builddep command, i identified these

diff --git a/tor-browser b/tor-browser
index 1fcbcb87f35ec42fbac9ccca1d1b297e81b76917..69547ec31e77f08970e91104c6bfa1c087fc3713 100755 (executable)
--- a/tor-browser
+++ b/tor-browser
@@ -21,7 +21,7 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
 # https://dist.torproject.org/torbrowser/
 
 ver=$(curl -s https://dist.torproject.org/torbrowser/ \
-          | sed -rn 's/.*href="([0-9]+\.[0-9]+).*/\1/p' \
+          | sed -rn 's/.*href="([0-9]+\.[0-9]+[.0-9]*)\/.*/\1/p' \
           | sort -Vr | head -n 1)