summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052025-03-06 14:12:22 +0800
committerzxp198210052025-03-06 14:12:22 +0800
commit255ef753ab79f51f648bedeb70b52e54beab6f09 (patch)
treed4ef133000acd31b6651420adbe155fe2599da30
parent7ac755e467aa04933d0e3bf5163218471e1da16d (diff)
downloadaur-darkorbit-client-bin.tar.gz
update to fix errors
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD30
-rw-r--r--darkorbit-client.sh2
3 files changed, 19 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 414e4661eb45..aa0977bbc58a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = darkorbit-client-bin
- pkgdesc = Open source darkorbit client (cross-platform and with better performance)
+ pkgdesc = Open source darkorbit client (cross-platform and with better performance)(Prebuilt version.Use system-wide electron)
pkgver = 2.8.0
- pkgrel = 8
+ pkgrel = 9
url = https://github.com/kaiserdj/Darkorbit-client
arch = x86_64
license = AGPL-3.0-only
@@ -9,7 +9,6 @@ pkgbase = darkorbit-client-bin
makedepends = asar
depends = electron11
depends = python>3
- depends = java-runtime
depends = python-psutil
provides = darkorbit-client=2.8.0
conflicts = darkorbit-client
@@ -18,6 +17,6 @@ pkgbase = darkorbit-client-bin
source = darkorbit-client-2.8.0.AppImage::https://github.com/kaiserdj/Darkorbit-client/releases/download/v2.8.0/DarkOrbit-Client-2.8.0.AppImage
source = darkorbit-client.sh
sha256sums = 36a64931d244c0524ce36288c191916374957006a1be81cbcff1d000a027c315
- sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051
+ sha256sums = 291f50480f5a61bc9c68db7d44cd0412071128706baa868a9cb854f8779a1980
pkgname = darkorbit-client-bin
diff --git a/PKGBUILD b/PKGBUILD
index 12c27f476d89..e59c29abb687 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@ pkgname=darkorbit-client-bin
_pkgname=DarkOrbit-Client
pkgver=2.8.0
_electronversion=11
-pkgrel=8
-pkgdesc="Open source darkorbit client (cross-platform and with better performance)"
+pkgrel=9
+pkgdesc="Open source darkorbit client (cross-platform and with better performance)(Prebuilt version.Use system-wide electron)"
arch=('x86_64')
url="https://github.com/kaiserdj/Darkorbit-client"
license=('AGPL-3.0-only')
@@ -13,7 +13,6 @@ conflicts=("${pkgname%-bin}")
depends=(
"electron${_electronversion}"
'python>3'
- 'java-runtime'
'python-psutil'
)
makedepends=(
@@ -29,26 +28,27 @@ source=(
"${pkgname%-bin}.sh"
)
sha256sums=('36a64931d244c0524ce36288c191916374957006a1be81cbcff1d000a027c315'
- '2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051')
-build() {
- sed -e "s|@electronversion@|${_electronversion}|g" \
- -e "s|@appname@|${pkgname%-bin}|g" \
- -e "s|@runname@|app.asar|g" \
- -e "s|@cfgdirname@|${pkgname%-bin}|g" \
- -e "s|@options@||g" \
- -i "${srcdir}/${pkgname%-bin}.sh"
- chmod a+x "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage"
+ '291f50480f5a61bc9c68db7d44cd0412071128706baa868a9cb854f8779a1980')
+prepare() {
+ sed -i -e "
+ s/@electronversion@/${_electronversion}/g
+ s/@appname@/${pkgname%-bin}/g
+ s/@runname@/app.asar/g
+ s/@cfgdirname@/${pkgname%-bin}/g
+ s/@options@//g
+ " "${srcdir}/${pkgname%-bin}.sh"
+ chmod +x "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage"
"${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" --appimage-extract > /dev/null
- sed "s|AppRun --no-sandbox|${pkgname%-bin}|g" -i "${srcdir}/squashfs-root/${pkgname%-bin}.desktop"
+ sed -i "s/AppRun --no-sandbox/${pkgname%-bin}/g" "${srcdir}/squashfs-root/${pkgname%-bin}.desktop"
find "${srcdir}/squashfs-root/resources/" -type d -exec chmod 755 {} \;
asar e "${srcdir}/squashfs-root/resources/app.asar" "${srcdir}/app.asar.unpacked"
- sed "s|process.resourcesPath|\"\/usr\/lib\/${pkgname%-bin}\"|g" -i "${srcdir}/app.asar.unpacked/core.js"
+ sed "s/process.resourcesPath/\"\/usr\/lib\/${pkgname%-bin}\"/g" -i "${srcdir}/app.asar.unpacked/core.js"
asar p "${srcdir}/app.asar.unpacked" "${srcdir}/app.asar"
}
package() {
install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
install -Dm644 "${srcdir}/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
- cp -r "${srcdir}/squashfs-root/resources/"{darkDev,flash} "${pkgdir}/usr/lib/${pkgname%-bin}"
+ cp -Pr --no-preserve=ownership "${srcdir}/squashfs-root/resources/"{darkDev,flash} "${pkgdir}/usr/lib/${pkgname%-bin}"
install -Dm644 "${srcdir}/squashfs-root/swiftshader/"* -t "${pkgdir}/usr/lib/${pkgname%-bin}/swiftshader"
install -Dm644 "${srcdir}/squashfs-root/usr/lib/"* -t "${pkgdir}/usr/lib/${pkgname%-bin}/lib"
for _icons in 16x16 32x32 64x64 128x128 256x256 512x512 1024x1024;do
diff --git a/darkorbit-client.sh b/darkorbit-client.sh
index 4cfe3ac09dd8..40e422ca2ee7 100644
--- a/darkorbit-client.sh
+++ b/darkorbit-client.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