fix errors

3 files changed, 26 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 716a9e6d73a4..cdc098cbdedc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = adbmanager-bin
 	pkgdesc = ADB manager for Android devices
 	pkgver = 3.1
-	pkgrel = 8
+	pkgrel = 9
 	url = https://github.com/AKotov-dev/adbmanager
 	arch = x86_64
 	license = GPL3
@@ -18,6 +18,8 @@ pkgbase = adbmanager-bin
 	provides = adbmanager=3.1
 	conflicts = adbmanager
 	source = adbmanager-3.1.deb::https://github.com/AKotov-dev/adbmanager/releases/download/v3.1/adbmanager_3.1-0.mrx8_amd64.deb
+	source = adbmanager.sh
 	sha256sums = 9f72d0df060a7877088bee9cb81761fefa59ab8f11f01c7ab4d11855749d8725
+	sha256sums = 30cfb99c0e7e0535080a140123c6dba934b6f4ad4174574dd40230d8eb1cc517
 
 pkgname = adbmanager-bin
diff --git a/PKGBUILD b/PKGBUILD
index 2785c12b854c..f994f391831b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,11 +2,13 @@
 # Contributor: Mark Wagie <mark dot wagie at proton dot me>
 pkgname=adbmanager-bin
 pkgver=3.1
-pkgrel=8
+pkgrel=9
 pkgdesc="ADB manager for Android devices"
 arch=('x86_64')
 url="https://github.com/AKotov-dev/adbmanager"
 license=('GPL3')
+provides=("${pkgname%-bin}=${pkgver}")
+conflicts=("${pkgname%-bin}")
 depends=(
     'android-tools'
     'iproute2'
@@ -19,17 +21,22 @@ depends=(
     'pango'
     'gtk2'
 )
-provides=("${pkgname%-bin}=${pkgver}")
-conflicts=("${pkgname%-bin}")
-source=("${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/v${pkgver}/${pkgname%-bin}_${pkgver}-0.mrx8_amd64.deb")
-sha256sums=('9f72d0df060a7877088bee9cb81761fefa59ab8f11f01c7ab4d11855749d8725')
+source=(
+    "${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/v${pkgver}/${pkgname%-bin}_${pkgver}-0.mrx8_amd64.deb"
+    "${pkgname%-bin}.sh"
+)
+sha256sums=('9f72d0df060a7877088bee9cb81761fefa59ab8f11f01c7ab4d11855749d8725'
+            '30cfb99c0e7e0535080a140123c6dba934b6f4ad4174574dd40230d8eb1cc517')
 build() {
+    sed -e "s|@appname@|${pkgname%-bin}|g" \
+        -e "s|@runname@|${pkgname%-bin}|g" \
+        -i "${srcdir}/${pkgname%-bin}.sh"
     bsdtar -xf "${srcdir}/data.tar.xz"
 }
 package() {
-    install -Dm755 -d "${pkgdir}/"{opt,usr/bin}
+    install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
+    install -Dm755 -d "${pkgdir}/opt"
     cp -r "${srcdir}/usr/share/${pkgname%-bin}" "${pkgdir}/opt"
-    ln -sf "/opt/${pkgname%-bin}/${pkgname%-bin}" "${pkgdir}/usr/bin/${pkgname%-bin}"
     install -Dm644 "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
     install -Dm644 "${srcdir}/usr/share/icons/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps"
 }
\ No newline at end of file
diff --git a/adbmanager.sh b/adbmanager.sh
new file mode 100644
index 000000000000..3199cc6dffba
--- /dev/null
+++ b/adbmanager.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+_APPDIR="/opt/@appname@"
+_RUNNAME="${_APPDIR}/@runname@"
+export PATH="${_APPDIR}:${PATH}"
+export LD_LIBRARY_PATH="${_APPDIR}/lib/x86_64-linux:${LD_LIBRARY_PATH}"
+cd "${_APPDIR}"
+exec "${_RUNNAME}" "$@"
+exit
\ No newline at end of file