summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052024-01-16 17:33:32 +0800
committerzxp198210052024-01-16 17:33:32 +0800
commitfdc1ace14c00d6c31052bf965c69625fb3b54d87 (patch)
tree1439088ce21e5717989d55d6b6915fbbcc7ead26
parentb270d87e3c8b3a6fc402056785c13f293dead929 (diff)
downloadaur-fdc1ace14c00d6c31052bf965c69625fb3b54d87.tar.gz
fix errors
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD9
-rw-r--r--whatsapp-electron.sh13
3 files changed, 12 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b13a9ea55ffc..a9550eba1a6b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,12 @@
pkgbase = whatsapp-electron-bin
pkgdesc = WhatsApp Client built on Electron with multi-account support!
pkgver = 1.1.1
- pkgrel = 3
+ pkgrel = 4
url = https://github.com/dagmoller/whatsapp-electron
arch = x86_64
license = custom
makedepends = squashfuse
depends = electron26
- depends = libx11
- depends = gdk-pixbuf2
- depends = libxext
depends = libdbusmenu-glib
depends = gtk2
depends = dbus-glib
@@ -18,6 +15,6 @@ pkgbase = whatsapp-electron-bin
source = whatsapp-electron-1.1.1.AppImage::https://github.com/dagmoller/whatsapp-electron/releases/download/v1.1.1/whatsapp-electron-1.1.1.AppImage
source = whatsapp-electron.sh
sha256sums = f95c0864886037968e2d0eecaca1f717822eacf55609a86d008a082234e1ca0d
- sha256sums = 8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84
+ sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
pkgname = whatsapp-electron-bin
diff --git a/PKGBUILD b/PKGBUILD
index 576786b5026c..4ad19a4e088a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=whatsapp-electron-bin
pkgver=1.1.1
_electronversion=26
-pkgrel=3
+pkgrel=4
pkgdesc="WhatsApp Client built on Electron with multi-account support!"
arch=("x86_64")
url="https://github.com/dagmoller/whatsapp-electron"
@@ -11,9 +11,6 @@ provides=("${pkgname%-bin}=${pkgver}")
conflicts=("${pkgname%-bin}")
depends=(
"electron${_electronversion}"
- 'libx11'
- 'gdk-pixbuf2'
- 'libxext'
'libdbusmenu-glib'
'gtk2'
'dbus-glib'
@@ -26,7 +23,7 @@ source=(
"${pkgname%-bin}.sh"
)
sha256sums=('f95c0864886037968e2d0eecaca1f717822eacf55609a86d008a082234e1ca0d'
- '8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84')
+ 'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
build() {
sed -e "s|@electronversion@|${_electronversion}|" \
-e "s|@appname@|${pkgname%-bin}|g" \
@@ -34,7 +31,7 @@ build() {
-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" -i "${srcdir}/squashfs-root/${pkgname%-bin}.desktop"
+ sed "s|AppRun --no-sandbox|${pkgname%-bin}|g" -i "${srcdir}/squashfs-root/${pkgname%-bin}.desktop"
}
package() {
install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
diff --git a/whatsapp-electron.sh b/whatsapp-electron.sh
index 2ec4412e5c4f..aacd8f895847 100644
--- a/whatsapp-electron.sh
+++ b/whatsapp-electron.sh
@@ -1,14 +1,15 @@
-#!/bin/bash
+#!/bin/sh
set -e
_APPDIR="/usr/lib/@appname@"
+_ASAR="${_APPDIR}/@appasar@"
export PATH="${_APPDIR}:${PATH}"
-export ELECTRON_IS_DEV=0
export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
-_ASAR="${_APPDIR}/@appasar@"
+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}" "$@"
else
- cd "${_APPDIR}"
exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
-fi \ No newline at end of file
+fi
+exit \ No newline at end of file