various fixes

[buildscripts] / tor-browser

diff --git a/tor-browser b/tor-browser
index 07fbe9be9a4f6811d8386736298c4da3475be235..c105e6e42ba0ff70592b9ddc7034207ae2afb5e1 100755 (executable)
--- 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:
@@ -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