Version update and other small fchanges

4 files changed, 39 insertions, 69 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c9d509be15de..d72befe57ed5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Mar  2 02:52:23 UTC 2016
+# Sat Mar 12 16:54:58 UTC 2016
 pkgbase = tor-messenger-bin
-	pkgdesc = A cross-platform chat program that aims to be secure by default and sends all of its traffic over Tor
-	pkgver = 0.1.0b4
-	pkgrel = 2
+	pkgdesc = Tor Messenger is +1 for privacy and -1 for mass surveillance
+	pkgver = 0.1.0b5
+	pkgrel = 1
 	url = https://www.torproject.org/
 	arch = i686
 	arch = x86_64
@@ -11,13 +11,13 @@ pkgbase = tor-messenger-bin
 	source = tor-messenger.desktop
 	source = tor-messenger.png
 	source = tor-messenger.sh
-	sha512sums = d504ead44500d1ab7b42d8184e7ab9619c6efa391852046823712e74b2935ebe5e985999936f19148e095df8f28969ad91e41f2809e02869667d904b735ac0db
+	sha512sums = 837e4fdc2acec2a4c2841de8d149fdf1ca637b62879978b73edaa9be36e95c9fefdeae86d3d7ae9f77119faaceeec1bbac4078ed31caf554939723af93dbdaf9
 	sha512sums = 6007a2fc63d33ceaee78c40e196d339bc9c40e73b45934416878f4dc4be6dbe7dbe364d1cdd6a811d0c0a5bd70c463300e3df4e40e8369a20e3d6a8a04059042
-	sha512sums = 90a72254441ef167b9fb7641484561256a0b8c7c305eb05bf07b9691c63a033890d3658cbedd0eb7e2ef0d31f117486380b50592e2af40977d99d475ab313ab3
-	source_i686 = https://dist.torproject.org/tormessenger/0.1.0b4/tor-messenger-linux32-0.1.0b4_en-US.tar.xz
-	sha512sums_i686 = 15660315f103e7e3e80603b6669662b854bd264bd944e76cbe0a150ee20a7c753936b404d99f08328775a2415c29b8f67505206829a2ec3a50c87d7a5ceacbb6
-	source_x86_64 = https://dist.torproject.org/tormessenger/0.1.0b4/tor-messenger-linux64-0.1.0b4_en-US.tar.xz
-	sha512sums_x86_64 = d6bc2643ef754d0e090a6306a2bba2c5eea28ababfea38f9e656212ec1d9122714421219f24141e122f8af819ea83b53f6b3d91ff3a8d5ea0a15bbef10618fc6
+	sha512sums = c20f4de84b868724a200645177e4a6094ba87cc0432c32ae775546e4115b4acd3369cd89725538b8da95de8587ee6ddd172d516bd19d0c7290be3e90fb8dca3c
+	source_i686 = https://dist.torproject.org/tormessenger/0.1.0b5/tor-messenger-linux32-0.1.0b5_en-US.tar.xz
+	sha512sums_i686 = cc9925d7889c14d21b564529365556efb70b3f58d8dfcb03208d189c098fbf91a70f8a1d55f4261f64dcb5d4c06ebe7bd9fc73d42ec975980c7c59319d5d8b34
+	source_x86_64 = https://dist.torproject.org/tormessenger/0.1.0b5/tor-messenger-linux64-0.1.0b5_en-US.tar.xz
+	sha512sums_x86_64 = c07f36074830bab8fbe4534480a771434562ef29e8565ff986e389e85649f7fef96738b48b8f1575bd4d26ec96122a8d09703efe70a906095e1d68272c9b897e
 
 pkgname = tor-messenger-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 8eb3403c0f96..90e8d053480c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,44 +2,41 @@
 # Contributor: Jonas Heinrich <onny at project-insanity dot org>
 
 pkgname=tor-messenger-bin
-pkgver=0.1.0b4
+pkgver=0.1.0b5
 _language='en-US'
-pkgrel=2
-pkgdesc="A cross-platform chat program that aims to be secure by default and sends all of its traffic over Tor"
+pkgrel=1
+pkgdesc="Tor Messenger is +1 for privacy and -1 for mass surveillance"
 arch=('i686' 'x86_64')
 url="https://www.torproject.org/"
 license=('MIT')
-source_i686=('https://dist.torproject.org/tormessenger/0.1.0b4/tor-messenger-linux32-0.1.0b4_en-US.tar.xz')
-source_x86_64=('https://dist.torproject.org/tormessenger/0.1.0b4/tor-messenger-linux64-0.1.0b4_en-US.tar.xz')
-source+=('tor-messenger.desktop'
-         'tor-messenger.png'
-         'tor-messenger.sh')
-sha512sums_i686=('15660315f103e7e3e80603b6669662b854bd264bd944e76cbe0a150ee20a7c753936b404d99f08328775a2415c29b8f67505206829a2ec3a50c87d7a5ceacbb6')
-sha512sums_x86_64=('d6bc2643ef754d0e090a6306a2bba2c5eea28ababfea38f9e656212ec1d9122714421219f24141e122f8af819ea83b53f6b3d91ff3a8d5ea0a15bbef10618fc6')
-sha512sums+=('d504ead44500d1ab7b42d8184e7ab9619c6efa391852046823712e74b2935ebe5e985999936f19148e095df8f28969ad91e41f2809e02869667d904b735ac0db'
+source_i686=("https://dist.torproject.org/tormessenger/${pkgver}/tor-messenger-linux32-${pkgver}_${_language}.tar.xz")
+source_x86_64=("https://dist.torproject.org/tormessenger/${pkgver}/tor-messenger-linux64-${pkgver}_${_language}.tar.xz")
+source+=(tor-messenger.desktop
+         tor-messenger.png
+         tor-messenger.sh)
+sha512sums_i686=('cc9925d7889c14d21b564529365556efb70b3f58d8dfcb03208d189c098fbf91a70f8a1d55f4261f64dcb5d4c06ebe7bd9fc73d42ec975980c7c59319d5d8b34')
+sha512sums_x86_64=('c07f36074830bab8fbe4534480a771434562ef29e8565ff986e389e85649f7fef96738b48b8f1575bd4d26ec96122a8d09703efe70a906095e1d68272c9b897e')
+sha512sums+=('837e4fdc2acec2a4c2841de8d149fdf1ca637b62879978b73edaa9be36e95c9fefdeae86d3d7ae9f77119faaceeec1bbac4078ed31caf554939723af93dbdaf9'
              '6007a2fc63d33ceaee78c40e196d339bc9c40e73b45934416878f4dc4be6dbe7dbe364d1cdd6a811d0c0a5bd70c463300e3df4e40e8369a20e3d6a8a04059042'
-             '90a72254441ef167b9fb7641484561256a0b8c7c305eb05bf07b9691c63a033890d3658cbedd0eb7e2ef0d31f117486380b50592e2af40977d99d475ab313ab3')
-noextract_i686=('tor-messenger-linux32-0.1.0b4_en-US.tar.xz')
-noextract_x86_64=('tor-messenger-linux64-0.1.0b4_en-US.tar.xz')
+             'c20f4de84b868724a200645177e4a6094ba87cc0432c32ae775546e4115b4acd3369cd89725538b8da95de8587ee6ddd172d516bd19d0c7290be3e90fb8dca3c')
+noextract_i686="tor-messenger-linux32-${pkgver}_${_language}.tar.xz"
+noextract_x86_64="tor-messenger-linux64-${pkgver}_${_language}.tar.xz"
 
 package() {
   cd ${srcdir}
 
-  sed -i 's/REPL_NAME/tor-messenger/g'    tor-messenger.sh
-  sed -i 's/REPL_VERSION/${pkgver}/g'     tor-messenger.sh
-  sed -i 's/REPL_LANGUAGE/${_language}/g' tor-messenger.sh
+  sed -i \
+    -e "s|REPL_VERSION|${pkgver}|g" \
+    -e "s|REPL_LANGUAGE|${_language}|g" \
+    tor-messenger.sh
 
-  sed -i 's/REPL_NAME/tor-messenger/g'    tor-messenger.desktop
-  sed -i 's/REPL_COMMENT/${pkgdesc}/g'    tor-messenger.desktop
-  sed -i 's/REPL_LANGUAGE/${_language}/g' tor-messenger.desktop
+  install -Dm0644 tor-messenger.desktop ${pkgdir}/usr/share/applications/tor-messenger.desktop
+  install -Dm0644 tor-messenger.png     ${pkgdir}/usr/share/pixmaps/tor-messenger.png
+  install -Dm0755 tor-messenger.sh      ${pkgdir}/usr/bin/tor-messenger
 
-  install -Dm 644 tor-messenger.desktop   ${pkgdir}/usr/share/applications/tor-messenger.desktop
-  install -Dm 644 tor-messenger.png       ${pkgdir}/usr/share/pixmaps/tor-messenger.png
-  install -Dm 755 tor-messenger.sh        ${pkgdir}/usr/bin/tor-messenger
-
-  if [[ '$CARCH' == 'i686' ]]; then
-     install -Dm 644 tor-messenger-linux32-${pkgver}_${_language}.tar.xz ${pkgdir}/opt/tor-messenger/tor-messenger-linux32-${pkgver}_${_language}.tar.xz
+  if [ '$CARCH' == 'i686' ] ; then
+    install -Dm0644 tor-messenger-linux32-${pkgver}_${_language}.tar.xz ${pkgdir}/opt/tor-messenger/tor-messenger-linux32-${pkgver}_${_language}.tar.xz
   else
-     install -Dm 644 tor-messenger-linux64-${pkgver}_${_language}.tar.xz ${pkgdir}/opt/tor-messenger/tor-messenger-linux64-${pkgver}_${_language}.tar.xz
+    install -Dm0644 tor-messenger-linux64-${pkgver}_${_language}.tar.xz ${pkgdir}/opt/tor-messenger/tor-messenger-linux64-${pkgver}_${_language}.tar.xz
   fi
 }
diff --git a/tor-messenger.desktop b/tor-messenger.desktop
index fac593a306bc..964a84eb64d0 100644
--- a/tor-messenger.desktop
+++ b/tor-messenger.desktop
@@ -1,29 +1,3 @@
-#!/usr/bin/env ./Messenger/execdesktop
-#
-# This file is a self-modifying .desktop file that can be run from the shell.
-# It preserves arguments and environment for the start-tor-messenger script.
-#
-# Run './start-tor-messenger.desktop --help' to display the full set of
-# options.
-#
-# When invoked from the shell, this file must always be in a Tor Messenger
-# root directory. When run from the file manager or desktop GUI, it is
-# relocatable.
-#
-# After first invocation, it will update itself with the absolute path to the
-# current TBB location, to support relocation of this .desktop file for GUI
-# invocation. You can also add Tor Messenger to your desktop's application
-# menu by running './start-tor-messenger.desktop --register-app'
-#
-# If you use --register-app, and then relocate your TBB directory, Tor
-# Messenger will no longer launch from your desktop's app launcher/dock.
-# However, if you re-run --register-app from inside that new directory, the
-# script will correct the absolute paths and re-register itself.
-#
-# This file will also still function if the path changes when TBB is used as a
-# portable app, so long as it is run directly from that new directory, either
-# via the shell or via the file manager.
-
 [Desktop Entry]
 Type=Application
 Name=Tor Messenger
@@ -31,4 +5,4 @@ GenericName=Instant Messenger
 Comment=Tor Messenger is +1 for privacy and -1 for mass surveillance
 Categories=Network;Chat;Security;
 Exec=/usr/bin/tor-messenger
-Icon=/usr/share/pixmaps/REPL_NAME.png
+Icon=/usr/share/pixmaps/tor-messenger.png
diff --git a/tor-messenger.sh b/tor-messenger.sh
index f3448a2e2c3c..917f13962a54 100755
--- a/tor-messenger.sh
+++ b/tor-messenger.sh
@@ -4,8 +4,7 @@
 # Copyright (C) 2012 Alessio Sergi <al3hex at gmail dot com>
 # modified 2012 for tor-browser (Max Roder <maxroder at web dot de>)
 # modified 2014 by Yardena Cohen <yardenack at gmail dot com>
-# modified 2015 for tor-messenger (shapow <echo c2hhcG93QDRyYXkuY28K \
-# | base64 -d>)
+# modified 2015, 2016 for tor-messenger (Jean Lucas <jean at 4ray dot co>)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,9 +22,9 @@
 set -e
 
 # filled by the PKGBUILD
-NAME='tor-messenger-bin'
-VERSION='0.1.0b4'
-LANGUAGE="en-US"
+NAME='tor-messenger'
+VERSION='REPL_VERSION'
+LANGUAGE="REPL_LANGUAGE"
 
 ARCH=$(getconf LONG_BIT)