Corrective Release 4.Thanks guys =)

6 files changed, 17 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8b169d943330..5cb3ff8b85f7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = rto-proxy-bin
 	pkgdesc = RuTracker proxy app based at electron + angularjs
 	pkgver = 0.2.3
-	pkgrel = 5
+	pkgrel = 6
 	url = https://rutracker.org/forum/viewtopic.php?t=5403116
 	install = rto-proxy-bin.install
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 7c2a38ec32e3..3c10b2e9c4e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 #Maintainer: naruto522ru <itachi522ru@gmail.com>
 pkgname=rto-proxy-bin
 pkgver=0.2.3
-pkgrel=5
+pkgrel=6
 pkgdesc='RuTracker proxy app based at electron + angularjs'
 arch=('x86_64' 'i686')
 url='https://rutracker.org/forum/viewtopic.php?t=5403116'
@@ -22,9 +22,8 @@ package() {
   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 "$pkgdir/etc/ld.so.conf.d/"
-  install -Dm 755 "$startdir/rto-proxy.conf" "$pkgdir/etc/ld.so.conf.d/"
-  msg2 "Install symlink..."
+# FIX ERROR SEE ---> https://github.com/RutrackerOrg/rutracker-proxy/issues/19#issuecomment-619498712
   install -dm 755 "$pkgdir/usr/bin/"
-  ln -s "/opt/rto-proxy/rto-proxy" "$pkgdir/usr/bin/rto-proxy"
+  install -Dm 755 "$startdir/rto-proxy" "$pkgdir/usr/bin/"
+  install -Dm 755 "$startdir/rto-proxy.desktop" "$pkgdir/usr/share/applications/"
 }
diff --git a/rto-proxy b/rto-proxy
new file mode 100644
index 000000000000..f73253bbbdf0
--- /dev/null
+++ b/rto-proxy
@@ -0,0 +1,5 @@
+#!/bin/sh
+export LD_PRELOAD=/opt/pango-legacy/usr/lib/libpango-1.0.so.0
+export LD_PRELOAD=/opt/pango-legacy/usr/lib/libpangocairo-1.0.so.0
+export LD_PRELOAD=/opt/pango-legacy/usr/lib/libpangoft2-1.0.so.0
+exec /opt/rto-proxy/rto-proxy "$@"
diff --git a/rto-proxy-bin.install b/rto-proxy-bin.install
index d0d8a8f58d4e..6fe059f7871c 100755
--- a/rto-proxy-bin.install
+++ b/rto-proxy-bin.install
@@ -1,8 +1,5 @@
 post_install() {
 echo '>>> НЕ гарантируется работа на i686!'
-echo '>>> После установки\обновления выполните на всякий случай команду от рута ldconfig.'
-echo '>>> Для удобства добавил симлинк теперь программу можно вызывать в терминале командой:rto-proxy'
-echo '>>> Это последний косметический fix'
 echo '>>> О багах пишем в AUR я время от времени поглядываю туда.'
 }
 
diff --git a/rto-proxy.conf b/rto-proxy.conf
deleted file mode 100644
index c854d0d836ad..000000000000
--- a/rto-proxy.conf
+++ /dev/null
@@ -1 +0,0 @@
-/opt/pango-legacy/usr/lib/
diff --git a/rto-proxy.desktop b/rto-proxy.desktop
new file mode 100644
index 000000000000..c7f071329378
--- /dev/null
+++ b/rto-proxy.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=rto-proxy
+Comment=RuTracker proxy app based at electron + angularjs
+Exec="/usr/bin/rto-proxy"
+Terminal=false
+Type=Application
+Icon=rto-proxy