diff options
| author | zxp19821005 | 2024-02-04 12:48:10 +0800 |
|---|---|---|
| committer | zxp19821005 | 2024-02-04 12:48:10 +0800 |
| commit | b32e4624132b06e6590fc353c3624662f615013b (patch) | |
| tree | 6a5a3bd116a655bfd6f37b897f168698e8cb575f | |
| parent | b158d3cc1d0438107c630ab75a7bff288302a26a (diff) | |
| download | aur-b32e4624132b06e6590fc353c3624662f615013b.tar.gz | |
fix errors
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | uyou-todo.sh | 11 |
3 files changed, 12 insertions, 21 deletions
@@ -1,18 +1,15 @@ pkgbase = uyou-todo-bin pkgdesc = A todo list with electron pkgver = 2.1.1 - pkgrel = 1 + pkgrel = 2 url = https://github.com/tonylu110/uyou-todo-electron arch = x86_64 license = MIT makedepends = squashfuse depends = electron26 - depends = libxext - depends = libx11 - depends = gdk-pixbuf2 depends = dbus-glib - depends = gtk2 depends = libdbusmenu-glib + depends = gtk2 provides = uyou-todo=2.1.1 conflicts = uyou-todo source = uyou-todo-2.1.1.AppImage::https://github.com/tonylu110/uyou-todo-electron/releases/download/2.1.1/uyou.ToDo-2.1.1.AppImage @@ -20,6 +17,6 @@ pkgbase = uyou-todo-bin source = uyou-todo.sh sha256sums = 2d3870d1b349a2a14292dd88a334c2f516c6e4810afc59daa62fd68064aed174 sha256sums = 39db5a38eec57377569ab296b6a804062b8e7a72908db228ae1d6d91bcbb61d3 - sha256sums = 5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf + sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014 pkgname = uyou-todo-bin @@ -3,7 +3,7 @@ pkgname=uyou-todo-bin _pkgname=uyoutodo pkgver=2.1.1 _electronversion=26 -pkgrel=1 +pkgrel=2 pkgdesc="A todo list with electron" arch=('x86_64') url="https://github.com/tonylu110/uyou-todo-electron" @@ -12,12 +12,9 @@ provides=("${pkgname%-bin}=${pkgver}") conflicts=("${pkgname%-bin}") depends=( "electron${_electronversion}" - 'libxext' - 'libx11' - 'gdk-pixbuf2' 'dbus-glib' - 'gtk2' 'libdbusmenu-glib' + 'gtk2' ) makedepends=( 'squashfuse' @@ -29,15 +26,15 @@ source=( ) sha256sums=('2d3870d1b349a2a14292dd88a334c2f516c6e4810afc59daa62fd68064aed174' '39db5a38eec57377569ab296b6a804062b8e7a72908db228ae1d6d91bcbb61d3' - '5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf') + '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014') build() { sed -e "s|@electronversion@|${_electronversion}|" \ -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 - sed "s|AppRun --no-sandbox %U|${pkgname%-bin}|g;s|${_pkgname}|${pkgname%-bin}|g" -i "${srcdir}/squashfs-root/${_pkgname}.desktop" + sed "s|AppRun --no-sandbox|${pkgname%-bin}|g;s|${_pkgname}|${pkgname%-bin}|g" -i "${srcdir}/squashfs-root/${_pkgname}.desktop" } package() { install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}" diff --git a/uyou-todo.sh b/uyou-todo.sh index c77c53567639..f9ced1432cfc 100644 --- a/uyou-todo.sh +++ b/uyou-todo.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 |