fix errors

3 files changed, 13 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 76e6a9afd4a7..1a4075d37886 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = wire-desktop-git
 	pkgdesc = End-to-end encrypted messenger with file sharing, voice calls and video conferences
-	pkgver = 3.32.3079.r495.g124e1ff2
+	pkgver = 3.34.3307
 	pkgrel = 1
 	url = https://wire.com/
 	arch = any
@@ -17,6 +17,6 @@ pkgbase = wire-desktop-git
 	source = wire-desktop.git::git+https://github.com/wireapp/wire-desktop.git
 	source = wire-desktop.sh
 	sha256sums = SKIP
-	sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
+	sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8
 
 pkgname = wire-desktop-git
diff --git a/PKGBUILD b/PKGBUILD
index 503f6caafeb6..0be9cf815d3f 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Conor Anderson <conor@conr.ca>
 # Contributor: Maxim Baz <$pkgname at maximbaz dot com>
 pkgname=wire-desktop-git
-pkgver=3.32.3079.r495.g124e1ff2
+pkgver=3.34.3307
 _electronversion=27
 _nodeversion=18
 pkgrel=1
@@ -31,7 +31,7 @@ source=(
     "${pkgname%-git}.sh"
 )
 sha256sums=('SKIP'
-            '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
+            'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8')
 pkgver() {
     cd "${srcdir}/${pkgname%-git}.git"
     git describe --tags | sed 's/\w\+\///g;s/\([^-]*-g\)/r\1/;s/-/./g'
@@ -46,6 +46,7 @@ build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname}|g" \
         -e "s|@runname@|app.asar|g" \
+        -e "s|@options@||g" \
         -i "${srcdir}/${pkgname%-git}.sh"
     _ensure_local_nvm
     gendesk -q -f -n --categories="Network" --name="${pkgname%-git}" --exec="${pkgname%-git} %U"
@@ -55,7 +56,10 @@ build() {
     export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')"
     export npm_config_target="${SYSTEM_ELECTRON_VERSION}"
     export ELECTRONVERSION="${_electronversion}"
+    export npm_config_disturl=https://electronjs.org/headers
     HOME="${srcdir}/.electron-gyp"
+    mkdir -p "${srcdir}/.electron-gyp"
+    touch "${srcdir}/.electron-gyp/.yarnrc"
     sed "s|, 'deb', 'rpm'||g" -i bin/build-tools/lib/build-linux.ts
     # .yarnrc.yml existed
     yarn install --immutable #--cache-folder "${srcdir}/.yarn_cache"
diff --git a/wire-desktop.sh b/wire-desktop.sh
index f9ced1432cfc..7ddcaab8d734 100644
--- a/wire-desktop.sh
+++ b/wire-desktop.sh
@@ -1,14 +1,16 @@
-#!/bin/sh
+#!/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}" "$@" || exit $?
+    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "$@" || exit $?
 else
-    exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
+    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $?
 fi
\ No newline at end of file