fix errors

3 files changed, 64 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 76a21b3a0dda..7aebd382711e 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,16 @@
 pkgbase = joindesktop-bin
 	pkgdesc = An official desktop app for Join by Joaoapps built in Electron.
 	pkgver = 1.1.2
-	pkgrel = 1
-	url = https://joaoapps.com/join/desktop
+	pkgrel = 2
+	url = https://joaoapps.com/join/desktop/
 	arch = x86_64
-	license = none
-	provides = joindesktop
+	license = MIT
+	depends = electron9-bin
+	provides = joindesktop=1.1.2
 	conflicts = joindesktop
-	source = https://github.com/joaomgcd/JoinDesktop/releases/download/v1.1.2/com.joaomgcd.join_1.1.2_amd64.deb
-	sha512sums = a0f18f1e21947cc15c10e5200b912dc6701f363c4f6abdaabbc5bee7f22510d23520027da29f2f6339a6de9c0c733c887606660085b6c174fcf56b2dafb9b440
+	source = joindesktop-1.1.2.deb::https://github.com/joaomgcd/JoinDesktop/releases/download/v1.1.2/com.joaomgcd.join_1.1.2_amd64.deb
+	source = joindesktop.sh
+	sha256sums = 9352d7fc70b7b5f2f845a8a9a3bc29fcb9dfacf6b7f31f0d05e291c8727bd825
+	sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8
 
 pkgname = joindesktop-bin
diff --git a/PKGBUILD b/PKGBUILD
index 7daa50ea18d9..1a1e16535cdb 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,43 @@
-# Maintainer: Toadtoad
-
+# Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
+# Contributor: Toadtoad
 pkgname=joindesktop-bin
+_pkgname=com.joaomgcd.join
+_appname="Join Desktop"
 pkgver=1.1.2
-pkgrel=1
+_electronversion=9
+pkgrel=2
 pkgdesc='An official desktop app for Join by Joaoapps built in Electron.'
-arch=('x86_64')
-license=('none')
-provides=('joindesktop')
-conflicts=('joindesktop')
-url='https://joaoapps.com/join/desktop'
-source=("https://github.com/joaomgcd/JoinDesktop/releases/download/v${pkgver}/com.joaomgcd.join_${pkgver}_amd64.deb")
-sha512sums=('a0f18f1e21947cc15c10e5200b912dc6701f363c4f6abdaabbc5bee7f22510d23520027da29f2f6339a6de9c0c733c887606660085b6c174fcf56b2dafb9b440')
-
-package() {
-  cd "${srcdir}"
-  tar -xf data.tar.xz -C "${pkgdir}"
-  cd "${pkgdir}"
+arch=("x86_64")
+url="https://joaoapps.com/join/desktop/"
+_ghurl="https://github.com/joaomgcd/JoinDesktop"
+license=('MIT')
+provides=("${pkgname%-bin}=${pkgver}")
+conflicts=("${pkgname%-bin}")
+depends=(
+    "electron${_electronversion}-bin"
+)
+source=(
+    "${pkgname%-bin}-${pkgver}.deb::${_ghurl}/releases/download/v${pkgver}/${_pkgname}_${pkgver}_amd64.deb"
+    "${pkgname%-bin}.sh"
+)
+sha256sums=('9352d7fc70b7b5f2f845a8a9a3bc29fcb9dfacf6b7f31f0d05e291c8727bd825'
+            'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8')
+build() {
+    sed -e "s|@electronversion@|${_electronversion}|g" \
+        -e "s|@appname@|${pkgname%-bin}|g" \
+        -e "s|@runname@|app.asar|g" \
+        -e "s|@options@||g" \
+        -i "${srcdir}/${pkgname%-bin}.sh"
+    bsdtar -xf "${srcdir}/data."*
+    sed "s|\"\/opt/${_appname}\/${_pkgname}\"|${pkgname%-bin}|g;s|Icon=${_pkgname}|Icon=${pkgname%-bin}|g" \
+        -i "${srcdir}/usr/share/applications/${_pkgname}.desktop"
 }
+package() {
+    install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/opt/${_appname}/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
+    cp -r "${srcdir}/opt/${_appname}/resources/app.asar.unpacked" "${pkgdir}/usr/lib/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/opt/${_appname}/swiftshader/"* -t "${pkgdir}/usr/lib/${pkgname%-bin}/swiftshader"
+    install -Dm644 "${srcdir}/usr/share/icons/hicolor/0x0/apps/${_pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-bin}.png"
+    install -Dm644 "${srcdir}/usr/share/applications/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname%-bin}.desktop"
+    install -Dm644 "${srcdir}/opt/${_appname}/LICENSE"* -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}
\ No newline at end of file
diff --git a/joindesktop.sh b/joindesktop.sh
new file mode 100644
index 000000000000..7ddcaab8d734
--- /dev/null
+++ b/joindesktop.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+set -e
+_APPDIR="/usr/lib/@appname@"
+_RUNNAME="${_APPDIR}/@runname@"
+_OPTIONS="@options@"
+export PATH="${_APPDIR}:${PATH}"
+export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
+export ELECTRON_IS_DEV=0
+export ELECTRON_FORCE_IS_PACKAGED=true
+export NODE_ENV=production
+cd "${_APPDIR}"
+if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
+    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "$@" || exit $?
+else
+    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $?
+fi
\ No newline at end of file