PKGBUILD and tor-browser.install only

3 files changed, 32 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f9d17cb6cee6..9e1d4c3c7d3a 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = tor-browser-de
 	pkgdesc = Tor Browser Bundle: anonymous browsing using Firefox and Tor (de)
 	pkgver = 8.0.5
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.torproject.org/projects/torbrowser.html
 	install = tor-browser.install
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 3baeb12586dc..ee781764a4b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,17 +12,17 @@
 # gpg --keyserver hkp://pgp.mit.edu:11371 --recv-keys 0x4E2C6E8793298290
 #
 
-# To port this PKGBUILD to another language of tor-browser you have to
-# change ONLY the variable ${_language} below
+# To port this PKGBUILD to another language of tor-browser you have to change
+# ONLY the variable `${_language}` both below and in `tor-browser.install`
 
 _language='de'
 
 # This PKGBUILD is based on https://aur.archlinux.org/packages/tor-browser/
 
-_pkgname='tor-browser'
-pkgname="${_pkgname}-${_language,,}"
+_appname='tor-browser'
+pkgname="${_appname}-${_language,,}"
 pkgver='8.0.5'
-pkgrel='1'
+pkgrel='2'
 pkgdesc="Tor Browser Bundle: anonymous browsing using Firefox and Tor (${_language})"
 url='https://www.torproject.org/projects/torbrowser.html'
 arch=('i686' 'x86_64')
@@ -38,17 +38,17 @@ optdepends=('zenity: simple dialog boxes'
 	'gst-libav: H.264 video'
 	'libpulse: PulseAudio audio driver'
 	'libnotify: Gnome dialog boxes')
-install="${_pkgname}.install"
+install="${_appname}.install"
 
 _archstr=$([[ "${CARCH}" == 'x86_64' ]] && echo -n "${_idstr64}" || echo -n "${_idstr32}")
 
 validpgpkeys=('EF6E286DDA85EA2A4BA7DE684E2C6E8793298290')
 
-source_i686=("https://dist.torproject.org/torbrowser/${pkgver}/${_pkgname}-${_idstr32}-${pkgver}_${_language}.tar.xz"{,.asc})
-source_x86_64=("https://dist.torproject.org/torbrowser/${pkgver}/${_pkgname}-${_idstr64}-${pkgver}_${_language}.tar.xz"{,.asc})
-source=("${_pkgname}.desktop"
-	"${_pkgname}.png"
-	"${_pkgname}.sh")
+source_i686=("https://dist.torproject.org/torbrowser/${pkgver}/${_appname}-${_idstr32}-${pkgver}_${_language}.tar.xz"{,.asc})
+source_x86_64=("https://dist.torproject.org/torbrowser/${pkgver}/${_appname}-${_idstr64}-${pkgver}_${_language}.tar.xz"{,.asc})
+source=("${_appname}.desktop"
+	"${_appname}.png"
+	"${_appname}.sh")
 
 sha256sums=('e9b6620a5683b2df7878d35a087039bf4449eb8648361a12ddbd968d98b59e8b'
             '17fc2f5784d080233aca16e788d62ab6fe3e57cf781b123cfe32767de97d6d3b'
@@ -58,26 +58,26 @@ sha256sums_i686=('SKIP'
 sha256sums_x86_64=('SKIP'
                    'SKIP')
 
-noextract=("${_pkgname}-${_idstr64}-${pkgver}_${_language}.tar.xz"
-	"${_pkgname}-${_idstr32}-${pkgver}_${_language}.tar.xz")
+noextract=("${_appname}-${_idstr64}-${pkgver}_${_language}.tar.xz"
+	"${_appname}-${_idstr32}-${pkgver}_${_language}.tar.xz")
 
 package() {
 
 	cd "${srcdir}"
 
-	sed -i "s/__REPL_LANGUAGE__/${_language}/g"	"${_pkgname}.desktop"
-	sed -i "s/__REPL_NAME__/${pkgname}/g"		"${_pkgname}.desktop"
+	sed -i "s/__REPL_LANGUAGE__/${_language}/g"	"${_appname}.desktop"
+	sed -i "s/__REPL_NAME__/${pkgname}/g"		"${_appname}.desktop"
 
-	sed -i "s/__REPL_NAME__/${pkgname}/g"		"${_pkgname}.sh"
-	sed -i "s/__REPL_VERSION__/${pkgver}/g"		"${_pkgname}.sh"
-	sed -i "s/__REPL_RELEASE__/${pkgrel}/g"		"${_pkgname}.sh"
-	sed -i "s/__REPL_LANGUAGE__/${_language}/g"	"${_pkgname}.sh"
-	sed -i "s/__REPL_ARCH__/${_archstr}/g"		"${_pkgname}.sh"
+	sed -i "s/__REPL_NAME__/${pkgname}/g"		"${_appname}.sh"
+	sed -i "s/__REPL_VERSION__/${pkgver}/g"		"${_appname}.sh"
+	sed -i "s/__REPL_RELEASE__/${pkgrel}/g"		"${_appname}.sh"
+	sed -i "s/__REPL_LANGUAGE__/${_language}/g"	"${_appname}.sh"
+	sed -i "s/__REPL_ARCH__/${_archstr}/g"		"${_appname}.sh"
 
-	install -Dm 644 "${_pkgname}.desktop"	"${pkgdir}/usr/share/applications/${pkgname}.desktop"
-	install -Dm 644 "${_pkgname}.png"	"${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-	install -Dm 755 "${_pkgname}.sh"	"${pkgdir}/usr/bin/${pkgname}"
+	install -Dm 644 "${_appname}.desktop"	"${pkgdir}/usr/share/applications/${pkgname}.desktop"
+	install -Dm 644 "${_appname}.png"	"${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+	install -Dm 755 "${_appname}.sh"	"${pkgdir}/usr/bin/${pkgname}"
 
-	install -Dm 644 "${_pkgname}-${_archstr}-${pkgver}_${_language}.tar.xz" "${pkgdir}/opt/${pkgname}/${_pkgname}-${_archstr}-${pkgver}_${_language}.tar.xz"
+	install -Dm 644 "${_appname}-${_archstr}-${pkgver}_${_language}.tar.xz" "${pkgdir}/opt/${pkgname}/${_appname}-${_archstr}-${pkgver}_${_language}.tar.xz"
 
 }
diff --git a/tor-browser.install b/tor-browser.install
index 5317164af9b0..6ba19702d4bc 100644
--- a/tor-browser.install
+++ b/tor-browser.install
@@ -1,16 +1,17 @@
-pkgname='tor-browser'
+_appname='tor-browser'
+_language='de'
 
 post_install() {
 	echo
-	echo "==> ${pkgname} will be extracted to ~/.${pkgname}"
-	echo "==> the first time you run ${pkgname} as your normal user!"
+	echo "==> ${_appname} (${_language}) will be extracted to ~/.${_appname}-${_language,,}"
+	echo "==> the first time you run it as your normal user!"
 	echo "==> Just start it and have fun."
 	echo
 }
 
 post_upgrade() {
 	echo
-	echo "==> The ${pkgname} copy in your home directory will be upgraded at the"
+	echo "==> The ${_appname} (${_language}) copy in your home directory will be upgraded at the"
 	echo "==> first time you run it as your normal user!"
 	echo "==> Just start and have fun."
 	echo
@@ -18,9 +19,9 @@ post_upgrade() {
 
 post_remove() {
 	echo
-	echo "==> You have to remove the tor-brower directory in your home"
+	echo "==> You have to remove the ${_appname} directory in your home"
 	echo "==> directory by hand: As your normal user, do:"
 	echo "==> "
-	echo "==> rm -rf ~/.${pkgname}"
+	echo "==> rm -rf ~/.${_appname}-${_language,,}"
 	echo
 }