network/tor-browser: Updated for version 13.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 11 insertions, 19 deletions

diff --git a/network/tor-browser/tor-browser.SlackBuild b/network/tor-browser/tor-browser.SlackBuild
index 79a9e661f1954..fd7644d91b7e4 100644
--- a/network/tor-browser/tor-browser.SlackBuild
+++ b/network/tor-browser/tor-browser.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=tor-browser
-VERSION=${VERSION:-12.5.6}
+VERSION=${VERSION:-13.0}
 PRGLANG=${PRGLANG:-ALL}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -33,7 +33,7 @@ PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
+    i?86) ARCH=i686 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -48,12 +48,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "x86_64" ]; then
-  SRCARCH=64
-else
-  SRCARCH=32
-fi
-
 set -e
 
 rm -rf $PKG
@@ -67,11 +61,11 @@ install -m 0755 $CWD/tor-browser.sh $PKG/usr/bin/tor-browser
 
 sed -i "s/REPL_NAME/$PRGNAM/g" $PKG/usr/bin/tor-browser
 sed -i "s/REPL_VERSION/$VERSION/g" $PKG/usr/bin/tor-browser
-sed -i "s/REPL_LANGUAGE/${PRGLANG}/g" $PKG/usr/bin/tor-browser
+sed -i "s/ARCH/$ARCH/g" $PKG/usr/bin/tor-browser
 
 # We have to copy the original source into the package
 mkdir -p $PKG/opt/$PRGNAM
-install -m 0644 $CWD/${PRGNAM}-linux${SRCARCH}-${VERSION}_${PRGLANG}.tar.xz $PKG/opt/$PRGNAM
+install -m 0644 $CWD/${PRGNAM}-linux-${ARCH}-${VERSION}.tar.xz $PKG/opt/$PRGNAM
 
 mkdir -p $PKG/usr/share/pixmaps
 install -m 0644 $CWD/mozicon128.png $PKG/usr/share/pixmaps/tor-browser.png
diff --git a/network/tor-browser/tor-browser.info b/network/tor-browser/tor-browser.info
index af81410b4bae2..5269451f55c99 100644
--- a/network/tor-browser/tor-browser.info
+++ b/network/tor-browser/tor-browser.info
@@ -1,10 +1,10 @@
 PRGNAM="tor-browser"
-VERSION="12.5.6"
+VERSION="13.0"
 HOMEPAGE="https://www.torproject.org"
-DOWNLOAD="https://www.torproject.org/dist/torbrowser/12.5.6/tor-browser-linux32-12.5.6_ALL.tar.xz"
-MD5SUM="a4aadc33f9f6d561ef6fab50db37f511"
-DOWNLOAD_x86_64="https://www.torproject.org/dist/torbrowser/12.5.6/tor-browser-linux64-12.5.6_ALL.tar.xz"
-MD5SUM_x86_64="d2413fcb0bc079619e8a3098c63e3e51"
+DOWNLOAD="https://dist.torproject.org/torbrowser/13.0/tor-browser-linux-i686-13.0.tar.xz"
+MD5SUM="a26aafa08a7ae347c3283a2de078aa03"
+DOWNLOAD_x86_64="https://www.torproject.org/dist/torbrowser/13.0/tor-browser-linux-x86_64-13.0.tar.xz"
+MD5SUM_x86_64="ddc4523f0e22a83e61910bad574bbcc8"
 REQUIRES=""
 MAINTAINER="Willy Sudiarto Raharjo"
 EMAIL="willysr@slackbuilds.org"
diff --git a/network/tor-browser/tor-browser.sh b/network/tor-browser/tor-browser.sh
index 5986909059aad..10f9fad0ddaeb 100644
--- a/network/tor-browser/tor-browser.sh
+++ b/network/tor-browser/tor-browser.sh
@@ -24,9 +24,7 @@ set -e
 # filled by the SLACKBUILD
 NAME='REPL_NAME'
 VERSION='REPL_VERSION'
-LANGUAGE="REPL_LANGUAGE"
-
-ARCH=$(getconf LONG_BIT)
+ARCH='ARCH'
 
 notify() {
   local title="$1"
@@ -46,7 +44,7 @@ notify() {
 update() {
 	echo "$0: Extracting files to $INSTALL_DIRECTORY." >> $LOG_FILE
 	rm -rf $INSTALL_DIRECTORY/*
-	tar --strip-components=1 -xJf /opt/$NAME/tor-browser-linux${ARCH}-${VERSION}_${LANGUAGE}.tar.xz \
+	tar --strip-components=1 -xJf /opt/$NAME/tor-browser-linux-${ARCH}-${VERSION}.tar.xz \
 		-C $INSTALL_DIRECTORY >> $LOG_FILE 2>&1 || notify "Error" \
 		"The tor-browser archive could not be extracted to your home directory. \
 		\nCheck permissions of $INSTALL_DIRECTORY. \