X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=tor-browser;h=c105e6e42ba0ff70592b9ddc7034207ae2afb5e1;hb=65a0d6984b02937e49093c32c37b5cfbc26e3b79;hp=b7f7de9902c5d3562eba1d888c51b94c5fb340f2;hpb=c426f5dc07b0a086a3163697db3abb516955566c;p=buildscripts

diff --git a/tor-browser b/tor-browser
index b7f7de9..c105e6e 100755
--- a/tor-browser
+++ b/tor-browser
@@ -1,4 +1,4 @@
-#!/bin/bash -l
+#!/bin/bash
 # Copyright (C) 2016 Ian Kelling
 
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,8 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+if [[ -s ~/.bashrc ]];then . ~/.bashrc;fi
 
 
 # stable version is shown on:
@@ -43,8 +42,8 @@ dl() {
   else
     timestamp=0
   fi
-  echo wget -N https://www.torproject.org/dist/torbrowser/$ver/$f
-  wget -N https://www.torproject.org/dist/torbrowser/$ver/$f || ret=$?
+  echo wget -nv -N https://www.torproject.org/dist/torbrowser/$ver/$f
+  wget -nv -N https://www.torproject.org/dist/torbrowser/$ver/$f || ret=$?
 }
 dl
 # 8 is return code for 404. for a new release, they might not have released to linux yet.
@@ -57,7 +56,7 @@ 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
+  tar Jxf $f
 fi
 
 for x in tor-*.tar.xz; do
@@ -66,4 +65,4 @@ for x in tor-*.tar.xz; do
   [[ $x != $f ]] || continue
   command rm -f $x
 done
-s lnf /a/opt/tor-browser_en-US/Browser/start-tor-browser /usr/local/bin
+sudo ln -sf /a/opt/tor-browser_en-US/Browser/start-tor-browser /usr/local/bin