Correcting Maintainer's errors (i.e. mine). Returned the upstream url. And he added something, changed it.

3 files changed, 58 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5cb3ff8b85f7..a9a4611eec6a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = rto-proxy-bin
 	pkgdesc = RuTracker proxy app based at electron + angularjs
 	pkgver = 0.2.3
-	pkgrel = 6
-	url = https://rutracker.org/forum/viewtopic.php?t=5403116
+	pkgrel = 7
+	url = https://github.com/RutrackerOrg/rutracker-proxy
 	install = rto-proxy-bin.install
 	arch = x86_64
 	arch = i686
@@ -14,15 +14,26 @@ pkgbase = rto-proxy-bin
 	depends = libxss
 	depends = nss
 	depends = pango-legacy
-	options = !strip
-	source_x86_64 = https://github.com/RutrackerOrg/rutracker-proxy/releases/download/v0.2.3/rto-proxy_0.2.3_amd64.deb
+	source_x86_64 = rto-proxy-0.2.3-x86_64.deb::https://github.com/RutrackerOrg/rutracker-proxy/releases/download/v0.2.3/rto-proxy_0.2.3_amd64.deb
 	source_x86_64 = https://www.dropbox.com/s/ghpvkkifaw6qrh8/app.asar
+	source_x86_64 = rto-proxy
+	source_x86_64 = rto-proxy-bin.install
+	source_x86_64 = rto-proxy.desktop
 	md5sums_x86_64 = ba8229621770652696b07152d15d703b
 	md5sums_x86_64 = 97dcbd2db3810aa62b02f24a6fa06b92
-	source_i686 = https://github.com/RutrackerOrg/rutracker-proxy/releases/download/v0.2.3/rto-proxy_0.2.3_i386.deb
+	md5sums_x86_64 = ffb38c0f5a441332254c739b665f3d35
+	md5sums_x86_64 = d3547df21d6cf86a2a2dcb9d96739127
+	md5sums_x86_64 = 9478d801cb2285b39e549268c9e17a82
+	source_i686 = rto-proxy-0.2.3-x86_64.deb::https://github.com/RutrackerOrg/rutracker-proxy/releases/download/v0.2.3/rto-proxy_0.2.3_i386.deb
 	source_i686 = https://www.dropbox.com/s/ghpvkkifaw6qrh8/app.asar
+	source_i686 = rto-proxy
+	source_i686 = rto-proxy-bin.install
+	source_i686 = rto-proxy.desktop
 	md5sums_i686 = 4d7ccd828131840f15b382ce5d08ff3b
 	md5sums_i686 = 97dcbd2db3810aa62b02f24a6fa06b92
+	md5sums_i686 = ffb38c0f5a441332254c739b665f3d35
+	md5sums_i686 = d3547df21d6cf86a2a2dcb9d96739127
+	md5sums_i686 = 9478d801cb2285b39e549268c9e17a82
 
 pkgname = rto-proxy-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 3c10b2e9c4e3..1ade8a150b45 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,47 @@
 #Maintainer: naruto522ru <itachi522ru@gmail.com>
+_pkgname=rto-proxy
 pkgname=rto-proxy-bin
 pkgver=0.2.3
-pkgrel=6
+pkgrel=7
 pkgdesc='RuTracker proxy app based at electron + angularjs'
 arch=('x86_64' 'i686')
-url='https://rutracker.org/forum/viewtopic.php?t=5403116'
+url='https://github.com/RutrackerOrg/rutracker-proxy'
 license=('MIT')
 depends=('gconf' 'libnotify' 'libappindicator-gtk2' 'libxtst' 'libxss' 'nss' 'pango-legacy')
-options=(!strip)
 install=rto-proxy-bin.install
 
-source_x86_64=("https://github.com/RutrackerOrg/rutracker-proxy/releases/download/v${pkgver}/rto-proxy_${pkgver}_amd64.deb" "https://www.dropbox.com/s/ghpvkkifaw6qrh8/app.asar")
-source_i686=("https://github.com/RutrackerOrg/rutracker-proxy/releases/download/v${pkgver}/rto-proxy_${pkgver}_i386.deb" "https://www.dropbox.com/s/ghpvkkifaw6qrh8/app.asar")
+source_x86_64=("$_pkgname-$pkgver-$arch.deb::${url}/releases/download/v$pkgver/${_pkgname}_${pkgver}_amd64.deb"
+               "https://www.dropbox.com/s/ghpvkkifaw6qrh8/app.asar"
+               "$_pkgname"
+               "$pkgname.install"
+               "$_pkgname.desktop")
+
+source_i686=("$_pkgname-$pkgver-$arch.deb::${url}/releases/download/v$pkgver/${_pkgname}_${pkgver}_i386.deb"
+             "https://www.dropbox.com/s/ghpvkkifaw6qrh8/app.asar"
+             "$_pkgname"
+             "$pkgname.install"
+             "$_pkgname.desktop")
+
 md5sums_x86_64=('ba8229621770652696b07152d15d703b'
-                '97dcbd2db3810aa62b02f24a6fa06b92')
+                '97dcbd2db3810aa62b02f24a6fa06b92'
+                'ffb38c0f5a441332254c739b665f3d35'
+                'd3547df21d6cf86a2a2dcb9d96739127'
+                '9478d801cb2285b39e549268c9e17a82'
+)
 md5sums_i686=('4d7ccd828131840f15b382ce5d08ff3b'
-              '97dcbd2db3810aa62b02f24a6fa06b92')
+              '97dcbd2db3810aa62b02f24a6fa06b92'
+              'ffb38c0f5a441332254c739b665f3d35'
+              'd3547df21d6cf86a2a2dcb9d96739127'
+              '9478d801cb2285b39e549268c9e17a82'
+)
 
 package() {
   msg2 "Extracting the data.tar.xz..."
   bsdtar -xf data.tar.xz -C "$pkgdir/"
 # FIX ERROR SEE ---> https://github.com/RutrackerOrg/rutracker-proxy/issues/9
-  install -Dm 755 "$srcdir/app.asar" "$pkgdir/opt/rto-proxy/resources/"
+  install -Dm 755 "$srcdir/app.asar" "$pkgdir/opt/$_pkgname/resources/"
 # FIX ERROR SEE ---> https://github.com/RutrackerOrg/rutracker-proxy/issues/19#issuecomment-619498712
   install -dm 755 "$pkgdir/usr/bin/"
-  install -Dm 755 "$startdir/rto-proxy" "$pkgdir/usr/bin/"
-  install -Dm 755 "$startdir/rto-proxy.desktop" "$pkgdir/usr/share/applications/"
+  install -Dm 755 "$srcdir/${_pkgname}" "$pkgdir/usr/bin/"
+  install -Dm 755 "$srcdir/${_pkgname}.desktop" "$pkgdir/usr/share/applications/"
 }
diff --git a/rto-proxy-bin.install b/rto-proxy-bin.install
index 6fe059f7871c..7a3f09a731c7 100755
--- a/rto-proxy-bin.install
+++ b/rto-proxy-bin.install
@@ -1,6 +1,18 @@
 post_install() {
-echo '>>> НЕ гарантируется работа на i686!'
-echo '>>> О багах пишем в AUR я время от времени поглядываю туда.'
+if [[ "$LANG" == "ru_RU.UTF-8"  ]]; then
+echo -e '\e[1;37m---\033[0m\e[1;33m>\033[0mНЕ гарантируется работа на \e[1;33mi686!\033[0m'
+echo -e '\e[1;37m---\033[0m\e[1;33m>\033[0mО багах пишем в \e[1;33mAUR\033[0m я время от времени поглядываю туда.'
+echo -e '\e[1;37m---\033[0m\e[1;33m>\033[0mОбсуждение данного ПО:'
+echo -e '\e[1;37m---\033[0m\e[1;34m>>\033[0mНа форуме трекера:https://rutracker.org/forum/viewtopic.php?t=5403116'
+echo -e '\e[1;37m---\033[0m\e[1;34m>>\033[0mНа GitHub:https://github.com/RutrackerOrg/rutracker-proxy/issues/'
+fi
+if [[ "$LANG" == "en_US.UTF-8"  ]]; then
+echo -e '\e[1;37m---\033[0m\e[1;33m>\033[0mNot guaranteed to work on \e[1;33mi686!\033[0m'
+echo -e '\e[1;37m---\033[0m\e[1;33m>\033[0mWe write about bugs in the \e[1;33mAUR\033[0m. I do not go there often. I may not answer right away.'
+echo -e '\e[1;37m---\033[0m\e[1;33m>\033[0mDiscussion of this software:'
+echo -e '\e[1;37m---\033[0m\e[1;34m>>\033[0mOn the tracker forum:https://rutracker.org/forum/viewtopic.php?t=5403116'
+echo -e '\e[1;37m---\033[0m\e[1;34m>>\033[0mOn GitHub:https://github.com/RutrackerOrg/rutracker-proxy/issues/'
+fi
 }
 
 post_upgrade() {