diff options
| author | zxp19821005 | 2024-02-06 12:12:42 +0800 |
|---|---|---|
| committer | zxp19821005 | 2024-02-06 12:12:42 +0800 |
| commit | 15a573ad21f1d6327b1dd72394618bd1be369f49 (patch) | |
| tree | c1fd09260c1c0f8e29a79690f64d8a07bdf1e2c7 | |
| parent | 4fae375ede6c5d23aa646d91ba3b51459ae3c6c7 (diff) | |
| download | aur-15a573ad21f1d6327b1dd72394618bd1be369f49.tar.gz | |
fix errors
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | marvin.sh | 11 |
3 files changed, 9 insertions, 12 deletions
@@ -1,7 +1,7 @@ pkgbase = marvin-bin pkgdesc = An app launcher for Linux and Windows pkgver = 0.4.9 - pkgrel = 6 + pkgrel = 7 url = https://rolandbernard.github.io/marvin/ arch = x86_64 license = MIT @@ -17,6 +17,6 @@ pkgbase = marvin-bin source = marvin.sh sha256sums = 624a42d8d31d56bd9a3b82f4b6258ebffd9b5f5d623575b44b120f3646ae269e sha256sums = 67cc90dae7113cf3572e7ae6b893b8e06960f696a6a1d3fc6b36b607cea970d6 - sha256sums = 5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf + sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014 pkgname = marvin-bin @@ -3,7 +3,7 @@ pkgname=marvin-bin _appname=Marvin pkgver=0.4.9 _electronversion=24 -pkgrel=6 +pkgrel=7 pkgdesc="An app launcher for Linux and Windows" arch=('x86_64') url="https://rolandbernard.github.io/marvin/" @@ -27,11 +27,11 @@ source=( ) sha256sums=('624a42d8d31d56bd9a3b82f4b6258ebffd9b5f5d623575b44b120f3646ae269e' '67cc90dae7113cf3572e7ae6b893b8e06960f696a6a1d3fc6b36b607cea970d6' - '5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf') + '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014') build() { sed -e "s|@electronversion@|${_electronversion}|g" \ -e "s|@appname@|${pkgname%-bin}|g" \ - -e "s|@appasar@|app.asar|g" \ + -e "s|@runname@|app.asar|g" \ -i "${srcdir}/${pkgname%-bin}.sh" chmod a+x "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" --appimage-extract > /dev/null diff --git a/marvin.sh b/marvin.sh index c77c53567639..f9ced1432cfc 100644 --- a/marvin.sh +++ b/marvin.sh @@ -1,17 +1,14 @@ #!/bin/sh set -e _APPDIR="/usr/lib/@appname@" -_ASAR="${_APPDIR}/@appasar@" +_RUNNAME="${_APPDIR}/@runname@" export PATH="${_APPDIR}:${PATH}" export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}" export ELECTRON_IS_DEV=0 export NODE_ENV=production +cd "${_APPDIR}" if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then - cd "${_APPDIR}" - exec electron@electronversion@ "${_ASAR}" "$@" - exit + exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $? else - cd "${_APPDIR}" - exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@" - exit + exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $? fi
\ No newline at end of file |