diff options
| -rwxr-xr-x | tor-browser | 48 |
1 files changed, 27 insertions, 21 deletions
diff --git a/tor-browser b/tor-browser index abba461..59bc430 100755 --- a/tor-browser +++ b/tor-browser @@ -7,23 +7,23 @@ BASENAME="`basename $0`" # Prefer torbrowser-launcher -if which torbrowser-launcher &> /dev/null; then - FOLDER="$HOME/.local/share/torbrowser/tbb/x86_64/tor-browser_en-US/Browser" - - # Sync vimperator config - if [ -e "$HOME/.vimperator" ] && [ -d "$FOLDER" ] && [ ! -e "$FOLDER/.vimperatorrc" ]; then - ( - cd "$FOLDER" - rm -f .vimperator .vimperatorrc - ln -sf "$HOME/.vimperator" - ln -sf "$HOME/.vimperatorrc" - ) - fi - - # Launch the other wrapper, forcing default locale. - mkdir -p $FOLDER/Logs - LC_ALL=C torbrowser-launcher &> $FOLDER/Logs/torbrowser-launcher.log & -else +#if which torbrowser-launcher &> /dev/null; then +# FOLDER="$HOME/.local/share/torbrowser/tbb/x86_64/tor-browser_en-US/Browser" +# +# # Sync vimperator config +# #if [ -e "$HOME/.vimperator" ] && [ -d "$FOLDER" ] && [ ! -e "$FOLDER/.vimperatorrc" ]; then +# #( +# # cd "$FOLDER" +# # rm -f .vimperator .vimperatorrc +# # ln -sf "$HOME/.vimperator" +# # ln -sf "$HOME/.vimperatorrc" +# #) +# #fi +# +# # Launch the other wrapper, forcing default locale. +# mkdir -p $FOLDER/Logs +# LC_ALL=C torbrowser-launcher &> $FOLDER/Logs/torbrowser-launcher.log & +#else # Classic mode ARCH="`uname -m`" @@ -35,13 +35,19 @@ else ARCH="linux64" fi - FOLDER="$HOME/apps/tor-browser/$ARCH" + #FOLDER="$HOME/apps/tor-browser/$ARCH" + FOLDER="$HOME/.local/bin/tor-browser/$ARCH" if [ -d "$FOLDER" ]; then mkdir -p $FOLDER/Logs cd $FOLDER - $FOLDER/start-tor-browser.desktop &> $FOLDER/Logs/tor-browser.log & + $FOLDER/start-tor-browser.desktop #&> $FOLDER/Logs/tor-browser.log & else - echo "Please download Tor Browser using tor-browser-dl or torbrowser-launcher first." + if which hoarder &> /dev/null; then + hoarder install tor-browser + else + #echo "Please download Tor Browser using tor-browser-dl or torbrowser-launcher first." + echo "Please download Tor Browser using tor-browser-dl or hoarder." + fi fi -fi +#fi |