fix errors

3 files changed, 12 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a02dd9a99f6e..def29b3988e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,12 +7,9 @@ pkgbase = threema-for-desktop-bin
 	license = MIT
 	makedepends = squashfuse
 	depends = electron21
-	depends = libx11
-	depends = gdk-pixbuf2
-	depends = libxext
+	depends = dbus-glib
 	depends = libdbusmenu-glib
 	depends = gtk2
-	depends = dbus-glib
 	provides = threema-for-desktop=2.5.1
 	conflicts = threema-for-desktop
 	source = threema-for-desktop-2.5.1.AppImage::https://github.com/GeekCornerGH/threema-for-desktop/releases/download/v2.5.1/Threema-For-Desktop-linux-2.5.1.AppImage
@@ -20,6 +17,6 @@ pkgbase = threema-for-desktop-bin
 	source = threema-for-desktop.sh
 	sha256sums = 8954d9b28bdc3b3c9caa115b3a15be79279366d8afb087b8a5e9577ec8bf6066
 	sha256sums = 92f52afa40f9343b922a111f5e79cfcb864e77e334b92d63b0a6c8bd9c45d94d
-	sha256sums = 8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84
+	sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
 
 pkgname = threema-for-desktop-bin
diff --git a/PKGBUILD b/PKGBUILD
index c544a4b8200b..fac14957c75d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,12 +13,9 @@ provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
 depends=(
     "electron${_electronversion}"
-    'libx11'
-    'gdk-pixbuf2'
-    'libxext'
+    'dbus-glib'
     'libdbusmenu-glib'
     'gtk2'
-    'dbus-glib'
 )
 makedepends=(
     'squashfuse'
@@ -30,7 +27,7 @@ source=(
 )
 sha256sums=('8954d9b28bdc3b3c9caa115b3a15be79279366d8afb087b8a5e9577ec8bf6066'
             '92f52afa40f9343b922a111f5e79cfcb864e77e334b92d63b0a6c8bd9c45d94d'
-            '8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84')
+            'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname%-bin}|g" \
@@ -38,7 +35,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;s|${_appname}|${pkgname%-bin}|g" -i "${srcdir}/squashfs-root/${_appname}.desktop"
+    sed "s|AppRun --no-sandbox|${pkgname%-bin}|g;s|${_appname}|${pkgname%-bin}|g" -i "${srcdir}/squashfs-root/${_appname}.desktop"
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
diff --git a/threema-for-desktop.sh b/threema-for-desktop.sh
index 2ec4412e5c4f..aacd8f895847 100644
--- a/threema-for-desktop.sh
+++ b/threema-for-desktop.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