summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052024-12-27 18:40:42 +0800
committerzxp198210052024-12-27 18:40:42 +0800
commit99b29034da7b27f23c5f7445bcb4f9808201d453 (patch)
tree3a759b9a34f5b9910a9a100cdc572ea5d6e113ad
parent79df6681570b27ba4e8bf2533b31704ce21e351b (diff)
downloadaur-99b29034da7b27f23c5f7445bcb4f9808201d453.tar.gz
update to fix errors
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD24
-rw-r--r--aliyun-adrive.sh2
3 files changed, 17 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b56951835244..bfa3a8f18d8a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = aliyun-adrive-bin
- pkgdesc = Aliyun aDrive阿里云盘
+ pkgdesc = Aliyun aDrive.(Ported from Windows version.Prebuilt version.Use system-wide electron).阿里云盘
pkgver = 4.11.0
- pkgrel = 6
+ pkgrel = 7
url = https://www.aliyundrive.com
arch = x86_64
license = LicenseRef-custom
@@ -15,7 +15,7 @@ pkgbase = aliyun-adrive-bin
source = aliyun-adrive-4.11.0.exe::https://github.com/zxp19821005/My_AUR_Files/releases/download/aDrive4.11.0/aDrive-4.11.0.exe
source = LICENSE.html
source = aliyun-adrive.sh
- sha256sums = 507bf86e5dffe75fc9cdd8caea0e1b284dd10dfeba435e331040c305958df7a6
+ sha256sums = 8f59a43065320d2c500bf04c96072d10b4448616b265b83620b973de1f8d30c9
sha256sums = ee4bf71493d9425c0270f59a72778d52b53a9bdcb981f462d1e699d347e9246e
sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051
diff --git a/PKGBUILD b/PKGBUILD
index 2e08a2292ce8..2b4f5443d99b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
# Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
pkgname=aliyun-adrive-bin
_pkgname=aDrive
+_zhsname='阿里云盘'
pkgver=4.11.0
_electronversion=22
-pkgrel=6
-pkgdesc="Aliyun aDrive阿里云盘"
+pkgrel=7
+pkgdesc="Aliyun aDrive.(Ported from Windows version.Prebuilt version.Use system-wide electron).${_zhsname}"
arch=('x86_64')
url="https://www.aliyundrive.com"
_dlurl="https://github.com/zxp19821005/My_AUR_Files"
@@ -27,17 +28,18 @@ source=(
"LICENSE.html"
"${pkgname%-bin}.sh"
)
-sha256sums=('507bf86e5dffe75fc9cdd8caea0e1b284dd10dfeba435e331040c305958df7a6'
+sha256sums=('8f59a43065320d2c500bf04c96072d10b4448616b265b83620b973de1f8d30c9'
'ee4bf71493d9425c0270f59a72778d52b53a9bdcb981f462d1e699d347e9246e'
'2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051')
build() {
- sed -e "s|@electronversion@|${_electronversion}|" \
- -e "s|@appname@|${pkgname%-bin}|g" \
- -e "s|@runname@|app.asar|g" \
- -e "s|@cfgdirname@|${_pkgname}|g" \
- -e "s|@options@||g" \
- -i "${srcdir}/${pkgname%-bin}.sh"
- gendesk -q -f -n --pkgname="${pkgname%-bin}" --pkgdesc="${pkgdesc}" --categories="Network" --name="${pkgname%-bin}阿里云盘" --exec="${pkgname%-bin} %U"
+ sed -e "
+ s/@electronversion@/${_electronversion}/g
+ s/@appname@/${pkgname%-bin}/g
+ s/@runname@/app.asar/g
+ s/@cfgdirname@/${_pkgname}/g
+ s/@options@//g
+ " -i "${srcdir}/${pkgname%-bin}.sh"
+ gendesk -q -f -n --pkgname="${pkgname%-bin}" --pkgdesc="${pkgdesc}" --categories="Network" --name="${pkgname%-bin}${_zhsname}" --exec="${pkgname%-bin} %U"
install -Dm755 -d "${srcdir}/tmp"
7z x -aoa "${srcdir}/${pkgname%-bin}-${pkgver}.exe" -o"${srcdir}/tmp"
find "${srcdir}/tmp/resources" -type d -exec chmod 755 {} \;
@@ -45,7 +47,7 @@ build() {
package() {
install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
install -Dm644 "${srcdir}/tmp/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
- cp -r "${srcdir}/tmp/resources/"{app.asar.unpacked,resource} "${pkgdir}/usr/lib/${pkgname%-bin}"
+ cp -Pr --no-preserve=ownership "${srcdir}/tmp/resources/"{app.asar.unpacked,resource} "${pkgdir}/usr/lib/${pkgname%-bin}"
install -Dm644 "${srcdir}/tmp/\$TEMP/aDriveSetup/res/form/logo.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-bin}.png"
install -Dm644 "${srcdir}/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
install -Dm644 "${srcdir}/LICENSE.html" -t "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/aliyun-adrive.sh b/aliyun-adrive.sh
index 4cfe3ac09dd8..40e422ca2ee7 100644
--- a/aliyun-adrive.sh
+++ b/aliyun-adrive.sh
@@ -21,7 +21,7 @@ if [[ -f "${_FLAGS_FILE}" ]]; then
fi
done < "${_FLAGS_FILE}"
fi
-cd "${_APPDIR}"
+cd "${_APPDIR}" || { echo "Failed to change directory to ${_APPDIR}"; exit 1; }
if [[ "${EUID}" -ne 0 ]] || [[ "${ELECTRON_RUN_AS_NODE}" ]]; then
exec electron@electronversion@ "${_RUNNAME}" ${_OPTIONS} "${_USER_FLAGS[@]}" "$@"
else