summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052023-07-31 18:53:49 +0800
committerzxp198210052023-07-31 18:53:49 +0800
commitdc20bb25f4f02e24237b8a2adc13654f8a8cd301 (patch)
tree11f3748be7db7e0fd55d081c4aa66c341044362d
parentca64fad4634c6306c5184bcea1243a1a7b799a86 (diff)
downloadaur-dc20bb25f4f02e24237b8a2adc13654f8a8cd301.tar.gz
update to 1.0-beta.5
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD28
-rw-r--r--ahmyth.sh6
3 files changed, 32 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4910cc13c852..038926a283a0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,24 @@
pkgbase = ahmyth-bin
pkgdesc = Cross-Platform Android Remote Administration Tool
- pkgver = 1.0beta.4
- pkgrel = 3
+ pkgver = 1.0_beta.5
+ pkgrel = 1
url = https://github.com/Morsmalleo/AhMyth
arch = i686
arch = x86_64
license = GPL3
- depends = electron
+ depends = bash
+ depends = electron11
depends = hicolor-icon-theme
+ depends = python
+ depends = java-runtime
+ depends = python-requests
provides = ahmyth
conflicts = ahmyth
source = ahmyth.sh
- sha256sums = a7cffbd41f630d53e307f289e20ff29946d08ed1fc45a9f1df1ce96320f3e845
- source_i686 = ahmyth-1.0beta.4-i686.deb::https://github.com/Morsmalleo/AhMyth/releases/download/v1.0-beta.4/AhMyth-Setup_i386-Linux.deb
- sha256sums_i686 = 875f24403471f583214c288e50850bea5ce2fad1a4bed3234fb34e59b0396942
- source_x86_64 = ahmyth-1.0beta.4-x86_64.deb::https://github.com/Morsmalleo/AhMyth/releases/download/v1.0-beta.4/AhMyth-Setup_amd64-Linux.deb
- sha256sums_x86_64 = b98abfefb1e1ff402b3a9b561c081008e314ff8c3f072c10d9734725a55c06ab
+ sha256sums = 4b6a46d703e85560a84c89337aec0f0e269e68df2a18b72939b000b765d0e94a
+ source_i686 = ahmyth-1.0_beta.5-i686.deb::https://github.com/Morsmalleo/AhMyth/releases/download/v1.0-beta.5/AhMyth-Setup_ia32.deb
+ sha256sums_i686 = 35c7bca338c9695a942e140eb859fefeabac855a85453fdd1df7c802c1196f98
+ source_x86_64 = ahmyth-1.0_beta.5-x86_64.deb::https://github.com/Morsmalleo/AhMyth/releases/download/v1.0-beta.5/AhMyth-Setup_amd64.deb
+ sha256sums_x86_64 = 4972835fd3bb2db43f1ae476d157804047d3b75dc25c1678f1c74522be42a1c4
pkgname = ahmyth-bin
diff --git a/PKGBUILD b/PKGBUILD
index dfaa8bd8c2ca..c1ef0c2635df 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,30 @@
# Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
pkgname=ahmyth-bin
-_ver=beta.4
-pkgver="1.0${_ver}"
-pkgrel=3
+_appname=AhMyth
+pkgver="1.0_beta.5"
+pkgrel=1
pkgdesc="Cross-Platform Android Remote Administration Tool"
arch=("i686" "x86_64")
url="https://github.com/Morsmalleo/AhMyth"
license=('GPL3')
-depends=('electron' 'hicolor-icon-theme')
+depends=('bash' 'electron11' 'hicolor-icon-theme' 'python' 'java-runtime' 'python-requests')
conflicts=("${pkgname%-bin}")
provides=("${pkgname%-bin}")
source=("${pkgname%-bin}.sh")
-source_i686=("${pkgname%-bin}-${pkgver}-i686.deb::${url}/releases/download/v${pkgver%${_ver}}-${_ver}/AhMyth-Setup_i386-Linux.deb")
-source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.deb::${url}/releases/download/v${pkgver%${_ver}}-${_ver}/AhMyth-Setup_amd64-Linux.deb")
-sha256sums=('a7cffbd41f630d53e307f289e20ff29946d08ed1fc45a9f1df1ce96320f3e845')
-sha256sums_i686=('875f24403471f583214c288e50850bea5ce2fad1a4bed3234fb34e59b0396942')
-sha256sums_x86_64=('b98abfefb1e1ff402b3a9b561c081008e314ff8c3f072c10d9734725a55c06ab')
+source_i686=("${pkgname%-bin}-${pkgver}-i686.deb::${url}/releases/download/v${pkgver//_/-}/${_appname}-Setup_ia32.deb")
+source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.deb::${url}/releases/download/v${pkgver//_/-}/${_appname}-Setup_amd64.deb")
+sha256sums=('4b6a46d703e85560a84c89337aec0f0e269e68df2a18b72939b000b765d0e94a')
+sha256sums_i686=('35c7bca338c9695a942e140eb859fefeabac855a85453fdd1df7c802c1196f98')
+sha256sums_x86_64=('4972835fd3bb2db43f1ae476d157804047d3b75dc25c1678f1c74522be42a1c4')
package() {
bsdtar -xf "${srcdir}/data.tar.xz"
- install -Dm644 "${srcdir}/opt/AhMyth/resources/app.asar" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}.asar"
install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}"
- sed "s|/opt/AhMyth/${pkgname%-bin} %U|/opt/${pkgname%-bin}/${pkgname%-bin}|g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
+ install -Dm644 "${srcdir}/opt/${_appname}/resources/app.asar" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}.asar"
+ cp -r "${srcdir}/opt/${_appname}/resources/app.asar.unpacked" "${pkgdir}/opt/${pkgname%-bin}"
+ sed "s|/opt/${_appname}/${pkgname%-bin} %U|/opt/${pkgname%-bin}/${pkgname%-bin}|g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
install -Dm644 "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
- cp -r "${srcdir}/usr/share/icons" "${pkgdir}/usr/share"
+ for _icons in 16x16 24x24 32x32 48x48 64x64 96x96 256x256;do
+ install -Dm644 "${srcdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-bin}.png" \
+ -t "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps"
+ done
} \ No newline at end of file
diff --git a/ahmyth.sh b/ahmyth.sh
index c750f9b089b9..b7ef6009beb7 100644
--- a/ahmyth.sh
+++ b/ahmyth.sh
@@ -1,6 +1,8 @@
#!/bin/bash
+_ELECTRON=/usr/bin/electron11
+_ASAR="/opt/ahmyth/ahmyth.asar"
if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
- exec electron /opt/ahmyth/ahmyth.asar "$@"
+ exec ${_ELECTRON} ${_ASAR} "$@"
else
- exec electron --no-sandbox /opt/ahmyth/ahmyth.asar "$@"
+ exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
fi \ No newline at end of file