summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD18
-rwxr-xr-xtor-browser.sh8
3 files changed, 14 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2ab9ba87d279..4d4adf0261f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -38,7 +38,7 @@ pkgbase = tor-browser
md5sums = 914bc94601657ac143f21acd8ed75747
md5sums = d7aa692701859b7ab6cd55f48e44e5e7
md5sums = 494afbfa60fb4ce21840244cc3f7208c
- md5sums = 45aad9b5bb9697724f824e0eec52e406
+ md5sums = 688fb4382e55ed0c6108a3d9df2ac8ef
source_i686 = https://dist.torproject.org/torbrowser/7.0.2/tor-browser-linux32-7.0.2_en-US.tar.xz
source_i686 = https://dist.torproject.org/torbrowser/7.0.2/tor-browser-linux32-7.0.2_en-US.tar.xz.asc
md5sums_i686 = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index acc07a5c0786..87858e9f0215 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -77,7 +77,7 @@ source=("${pkgname}.desktop"
md5sums=('914bc94601657ac143f21acd8ed75747'
'd7aa692701859b7ab6cd55f48e44e5e7'
'494afbfa60fb4ce21840244cc3f7208c'
- '45aad9b5bb9697724f824e0eec52e406')
+ '688fb4382e55ed0c6108a3d9df2ac8ef')
md5sums_i686=('SKIP'
'SKIP')
md5sums_x86_64=('SKIP'
@@ -93,14 +93,14 @@ package() {
msg "Packaging ${pkgname} (language: ${_language})..."
if [ -z "${TORBROWSER_PKGLANG}" ]; then
- msg ''
- msg "Note: if you want to package ${pkgname} in a different language, please"
- msg 'set a `TORBROWSER_PKGLANG` environment variable before running `makepkg`.'
- msg ''
- msg 'For instance:'
- msg ''
- msg " TORBROWSER_PKGLANG='en-US' makepkg"
- msg ''
+ echo
+ echo -e " \e[1;34m->\e[0m \e[1;31mNOTE:\e[0m If you want to package ${pkgname} in a different language, please"
+ echo ' set a `TORBROWSER_PKGLANG` environment variable before running makepkg.'
+ echo
+ echo ' For instance:'
+ echo
+ echo -e " \e[0;33mTORBROWSER_PKGLANG='en-US' makepkg\e[0m"
+ echo
fi
sed -i "s/__REPL_LANGUAGE__/${_language}/g" "${pkgname}.desktop"
diff --git a/tor-browser.sh b/tor-browser.sh
index 6d54234d55d8..e0b1b3c00147 100755
--- a/tor-browser.sh
+++ b/tor-browser.sh
@@ -2,9 +2,9 @@
# Copyright (C) 2009 Benjamin Drung <bdrung at ubuntu dot com>
# Copyright (C) 2012 Alessio Sergi <al3hex at gmail dot com>
+# Copyright (C) 2017 grufo <madmurphy333 at gmail dot com> (Arch User Repository version)
# modified 2012 for tor-browser (Max Roder <maxroder at web dot de>)
# modified 2014 by Yardena Cohen <yardenack at gmail dot com>
-# modified 2017 by grufo <madmurphy333 at gmail dot com>
#
# 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
@@ -103,13 +103,13 @@ _aur_update_() {
local AUR_RELEASE="$(grep 'pkgrel' '.SRCINFO' | cut -d = -f2 | sed -e 's/^[[:space:]]*//')"
if _compare_ver_ "${_TB_VERSION_}" "${AUR_VERSION}"; then
- echo 'Found new version.'
+ echo "Found new version (${AUR_VERSION})..."
local DO_UPDATE=1
elif [[ "${_TB_VERSION_}" == "${AUR_VERSION}" ]] && [[ "${_TB_RELEASE_}" != "${AUR_RELEASE}" ]] && [[ "${_TB_RELEASE_}" == "`echo -e "${_TB_RELEASE_}\n${AUR_RELEASE}" | sort | head -n1`" ]]; then
- echo 'Found new PKGBUILD.'
+ echo 'Found new PKGBUILD...'
local DO_UPDATE=1
else
- echo "Everything is up to date (version: ${_TB_VERSION_})"
+ echo "Everything is up to date (current version: ${_TB_VERSION_})."
fi
[[ ${DO_UPDATE} -eq 1 ]] && makepkg -si