Support for torbrowser-launcher at tor-browser

diff --git a/tor-browser b/tor-browser
index eaf2b4838302d7f3379d3dc9f68a5df89ac09dbe..87b97f1e3ce775a98c5d5c0b2db5476ffe16be76 100755 (executable)
--- a/tor-browser
+++ b/tor-browser
@@ -3,16 +3,43 @@
 # Wrapper for the Tor Software Bundle
 #
 
-ARCH="`uname -m`"
+# Parameters
+BASENAME="`basename $0`"
 
-if [ "$ARCH" == "i386" ]; then
-  ARCH="linux32"
-elif [ "$ARCH" == "i686" ]; then
-  ARCH="linux32"
-elif [ "$ARCH" == "x86_64" ]; then
-  ARCH="linux64"
-fi
+# Prefer torbrowser-launcher
+if which torbrowser-launcher &> /dev/null; then
+  FOLDER="$HOME/.local/share/torbrowser/tbb/x86_64/tor-browser_pt-PT/Browser"
+
+  # Sync vimperator config
+  if [ -e "$HOME/.vimperator" ] && [ -d "$FOLDER" ]; then
+  (
+    cd "$FOLDER"
+    ln -s "$HOME/.vimperator"
+    ln -s "$HOME/.vimperatorrc"
+  )
+  fi
+
+  # Launch the other wrapper
+  torbrowser-launcher &
+else
+  # Classic mode
+  ARCH="`uname -m`"
 
-mkdir -p $HOME/apps/tor-browser/$ARCH/Logs
-cd $HOME/apps/tor-browser/$ARCH
-$HOME/apps/tor-browser/$ARCH/start-tor-browser.desktop &> $HOME/apps/tor-browser/$ARCH/Logs/tor-browser.log &
+  if [ "$ARCH" == "i386" ]; then
+    ARCH="linux32"
+  elif [ "$ARCH" == "i686" ]; then
+    ARCH="linux32"
+  elif [ "$ARCH" == "x86_64" ]; then
+    ARCH="linux64"
+  fi
+
+  FOLDER="$HOME/apps/tor-browser/$ARCH"
+
+  if [ -d "$FOLDER" ]; then
+    mkdir -p $FOLDER/Logs
+    cd $FOLDER
+    $FOLDER/start-tor-browser.desktop &> $FOLDER/Logs/tor-browser.log &
+  else
+    echo "Please download Tor Browser using tor-browser-dl or torbrowser-launcher first."
+  fi
+fi