diff options
| author | zxp19821005 | 2023-09-12 18:38:11 +0800 |
|---|---|---|
| committer | zxp19821005 | 2023-09-12 18:38:11 +0800 |
| commit | 23704c7184c124d1f5bcbad4ee5c3737bb865fe6 (patch) | |
| tree | 747a88cc7b908f02060fe8738d7c959c47082b42 | |
| parent | 14460aefc7f882bc68ec2ae69cdbdc9be7045d9d (diff) | |
| download | aur-23704c7184c124d1f5bcbad4ee5c3737bb865fe6.tar.gz | |
fix errors
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 14 | ||||
| -rw-r--r-- | google-assistant-unofficial-desktop-client.sh | 6 |
3 files changed, 14 insertions, 10 deletions
@@ -1,13 +1,13 @@ pkgbase = google-assistant-unofficial-desktop-client-bin pkgdesc = A cross-platform unofficial Google Assistant Client for Desktop (powered by Google Assistant SDK) pkgver = 1.1.0 - pkgrel = 5 + pkgrel = 6 url = https://github.com/Melvin-Abraham/Google-Assistant-Unofficial-Desktop-Client arch = x86_64 license = Apache + depends = bash depends = electron10 depends = hicolor-icon-theme - depends = bash provides = google-assistant-unofficial-desktop-client=1.1.0 conflicts = google-assistant-unofficial-desktop-client source = google-assistant-unofficial-desktop-client-1.1.0.deb::https://github.com/Melvin-Abraham/Google-Assistant-Unofficial-Desktop-Client/releases/download/v1.1.0/Google-Assistant-Setup-1.1.0-amd64.deb @@ -4,24 +4,26 @@ pkgname=google-assistant-unofficial-desktop-client-bin _appname=g-assist _installname="Google Assistant" pkgver=1.1.0 -pkgrel=5 +pkgrel=6 pkgdesc="A cross-platform unofficial Google Assistant Client for Desktop (powered by Google Assistant SDK)" arch=('x86_64') url="https://github.com/Melvin-Abraham/Google-Assistant-Unofficial-Desktop-Client" license=('Apache') -depends=('electron10' 'hicolor-icon-theme' 'bash') +depends=('bash' 'electron10' 'hicolor-icon-theme') provides=("${pkgname%-bin}=${pkgver}") conflicts=("${pkgname%-bin}") source=("${pkgname%-bin}-${pkgver}.deb::$url/releases/download/v$pkgver/${_installname// /-}-Setup-${pkgver}-amd64.deb" "${pkgname%-bin}.sh") sha256sums=('97ef51b6950d14ac0bc34aa5705b125b09d67d0f5e5cafa686f7757ff751a510' '2141d982207538cbb78c92554043b5b533fd5ceabe03628d9eb0b438d67fef52') -package() { +prepare() { bsdtar -xf "${srcdir}/data.tar.xz" - install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}" - install -Dm755 "${srcdir}/opt/${_installname}/resources/app.asar" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}.asar" - sed "s|\"/opt/${_installname}/${_appname}\" %U|/opt/${pkgname%-bin}/${pkgname%-bin}|g;s|${_appname}|${pkgname%-bin}|g;s|Productivity|Utility|g" \ + sed "s|\"/opt/${_installname}/${_appname}\" %U|${pkgname%-bin}|g;s|${_appname}|${pkgname%-bin}|g;s|Productivity|Utility|g" \ -i "${srcdir}/usr/share/applications/${_appname}.desktop" +} +package() { + install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}" + install -Dm755 "${srcdir}/opt/${_installname}/resources/app.asar" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}.asar" install -Dm644 "${srcdir}/usr/share/applications/${_appname}.desktop" "${pkgdir}/usr/share/applications/${pkgname%-bin}.desktop" for _icons in 16x16 32x32 48x48 64x64 128x128 256x256 512x512 1024x1024;do install -Dm644 "${srcdir}/usr/share/icons/hicolor/${_icons}/apps/${_appname}.png" \ diff --git a/google-assistant-unofficial-desktop-client.sh b/google-assistant-unofficial-desktop-client.sh index 94b1a92b1bd7..ad34a7e4163a 100644 --- a/google-assistant-unofficial-desktop-client.sh +++ b/google-assistant-unofficial-desktop-client.sh @@ -1,6 +1,8 @@ #!/bin/bash +_ELECTRON=/usr/bin/electron10 +_ASAR="/opt/google-assistant-unofficial-desktop-client/google-assistant-unofficial-desktop-client.asar" if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then - exec electron10 /opt/google-assistant-unofficial-desktop-client/google-assistant-unofficial-desktop-client.asar "$@" + exec ${_ELECTRON} ${_ASAR} "$@" else - exec electron10 --no-sandbox /opt/google-assistant-unofficial-desktop-client/google-assistant-unofficial-desktop-client.asar "$@" + exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@" fi
\ No newline at end of file |