summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052024-02-05 14:01:54 +0800
committerzxp198210052024-02-05 14:01:54 +0800
commit30e6046e7d4b81b9efc61dfd65ebebe343d71118 (patch)
treecc3c370faa9490a0a4ba89830e8dea2eb27c8883
parent57c44661501ed3f2edbab13785de8fee509669b3 (diff)
downloadaur-30e6046e7d4b81b9efc61dfd65ebebe343d71118.tar.gz
fix errors
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD8
-rw-r--r--aliyun-adrive.sh9
3 files changed, 11 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f603a2dab6e4..2c00086c2151 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
pkgbase = aliyun-adrive-bin
pkgdesc = Aliyun aDrive阿里云盘
pkgver = 4.11.0
- pkgrel = 1
+ pkgrel = 2
url = https://www.aliyundrive.com
arch = x86_64
license = LicenseRef-custom
makedepends = gendesk
makedepends = p7zip
- depends = electron25
+ depends = electron22
provides = aliyun-adrive=4.11.0
conflicts = aliyun-adrive
conflicts = deepin-wine-adrive
@@ -17,6 +17,6 @@ pkgbase = aliyun-adrive-bin
source = aliyun-adrive.sh
sha256sums = 507bf86e5dffe75fc9cdd8caea0e1b284dd10dfeba435e331040c305958df7a6
sha256sums = e266be0821c3ebe2521767404dccb1d4cd4000be8fe318174bdb5c70ac015509
- sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
+ sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
pkgname = aliyun-adrive-bin
diff --git a/PKGBUILD b/PKGBUILD
index 1eefbaa55341..d50a922d0611 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
pkgname=aliyun-adrive-bin
pkgver=4.11.0
-_electronversion=25
-pkgrel=1
+_electronversion=22
+pkgrel=2
pkgdesc="Aliyun aDrive阿里云盘"
arch=('x86_64')
url="https://www.aliyundrive.com"
@@ -27,11 +27,11 @@ source=(
)
sha256sums=('507bf86e5dffe75fc9cdd8caea0e1b284dd10dfeba435e331040c305958df7a6'
'e266be0821c3ebe2521767404dccb1d4cd4000be8fe318174bdb5c70ac015509'
- 'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
+ '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"
gendesk -q -f -n --categories "Network" --name "${pkgname%-bin}阿里云盘" --exec "${pkgname%-bin} %U"
install -Dm755 -d "${srcdir}/tmp"
diff --git a/aliyun-adrive.sh b/aliyun-adrive.sh
index aacd8f895847..f9ced1432cfc 100644
--- a/aliyun-adrive.sh
+++ b/aliyun-adrive.sh
@@ -1,15 +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
- exec electron@electronversion@ "${_ASAR}" "$@"
+ exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
else
- exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
-fi
-exit \ No newline at end of file
+ exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
+fi \ No newline at end of file