3.90.11: use system electron

3 files changed, 54 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c3f0113001c0..edf66a851a6a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = beeper-latest-bin
 	pkgdesc = all your chats in one app
-	pkgver = 3.85.17
+	pkgver = 3.90.11
 	pkgrel = 1
 	url = https://beeper.com/
 	arch = x86_64
@@ -8,7 +8,7 @@ pkgbase = beeper-latest-bin
 	provides = beeper
 	conflicts = beeper
 	options = !strip
-	source = beeper-3.85.17-build-231109zg8yl8v6s.AppImage::https://download.beeper.com/linux/appImage/x64
+	source = beeper-3.90.11-build-2312112f0wxx20y.AppImage::https://download.beeper.com/linux/appImage/x64
 	sha256sums = SKIP
 
 pkgname = beeper-latest-bin
diff --git a/PKGBUILD b/PKGBUILD
index c2c9485480fd..47fc18cd8f78 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,14 @@
 
 ## options
 : ${_autoupdate:=true}
-: ${_pkgver:=3.85.17}
-
-: ${_test:=false}
+: ${_system_electron:=true}
 
 : ${_pkgtype:=latest-bin}
 
 # basic info
 _pkgname='beeper'
 pkgname="$_pkgname${_pkgtype:+-$_pkgtype}"
-pkgver=3.85.17
+pkgver=3.90.11
 pkgrel=1
 pkgdesc="all your chats in one app"
 arch=('x86_64')
@@ -29,11 +27,6 @@ _main_package() {
 
   source+=("$_filename"::"$_dl_url")
   sha256sums+=('SKIP')
-
-  if [[ x"${_test::1}" == "xt" ]] ; then
-    source+=("beeper.sh")
-    sha256sums+=('SKIP')
-  fi
 }
 
 # common functions
@@ -41,6 +34,30 @@ pkgver() {
   printf '%s' "${_pkgver:?}"
 }
 
+prepare() {
+  cat <<'EOF' > "$_pkgname.sh"
+#!/usr/bin/env sh
+set -e
+
+APPDIR=$(dirname `readlink -f "$0"`)
+XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
+
+_ELECTRON=/usr/bin/electron
+_ASAR="${APPDIR}/resources/app.asar"
+_FLAGS_FILE="$XDG_CONFIG_HOME/beeper-flags.conf"
+
+if [ -r "$_FLAGS_FILE" ]; then
+  _USER_FLAGS="$(cat "$_FLAGS_FILE")"
+fi
+
+if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
+    exec ${_ELECTRON} ${_ASAR} $_USER_FLAGS "$@"
+else
+    exec ${_ELECTRON} ${_ASAR} --no-sandbox $_USER_FLAGS "$@"
+fi
+EOF
+}
+
 build() {
   cd "${srcdir:?}"
 
@@ -71,7 +88,7 @@ _package_beeper() {
   mv "${srcdir:?}/squashfs-root" "${pkgdir:?}/opt/beeper"
 }
 
-_package_test() {
+_package_asar() {
   # script
   install -Dm755 "${srcdir:?}/beeper.sh" -t "${pkgdir:?}/opt/beeper/"
 
@@ -101,9 +118,9 @@ package() {
   install -Dm644 "${srcdir:?}/squashfs-root/LICENSE.electron.txt" -t "${pkgdir:?}/usr/share/licenses/$pkgname"
   install -Dm644 "${srcdir:?}/squashfs-root/LICENSES.chromium.html" -t "${pkgdir:?}/usr/share/licenses/$pkgname"
 
-  if [[ x"${_test::1}" == "xt" ]] ; then
+  if [[ "${_system_electron::1}" == "t" ]] ; then
     depends+=('electron')
-    _package_test
+    _package_asar
   else
     _package_beeper
   fi
@@ -111,28 +128,29 @@ package() {
 
 # update version
 _update_version() {
-  case "${_autoupdate::1}" in
-    't'|'y'|'1')
-      _dl_url="https://download.beeper.com/linux/appImage/x64"
-
-      _filename=$(
-        curl -v --no-progress-meter -r 0-1 "$_dl_url" 2>&1 >/dev/null \
-          | grep content-disposition \
-          | sed -E 's@^.*\bcontent-disposition:.*\bfilename="([^"]+)".*$@\1@'
-      )
-
-      _pkgver_new=$(
-        printf '%s' "$_filename" \
-          | sed -E 's@^beeper-([0-9]+\.[0-9]+\.[0-9]+)(-.*)?.AppImage$@\1@'
-      )
-
-      # update _pkgver
-      if [ x"$_pkgver" != x"${_pkgver_new:?}" ] ; then
-        _pkgver="$_pkgver_new"
-        sed -Ei "s@^(\s*: \\\$\{_pkgver):=.*\}\$@\1:=${_pkgver:?}}@" "$startdir/PKGBUILD"
-      fi
-      ;;
-  esac
+  : ${_pkgver:=$pkgver}
+
+  if [[ "${_autoupdate::1}" != 't' ]] ; then
+    return
+  fi
+
+  _dl_url="https://download.beeper.com/linux/appImage/x64"
+
+  _filename=$(
+    curl -v --no-progress-meter -r 0-1 "$_dl_url" 2>&1 >/dev/null \
+      | grep content-disposition \
+      | sed -E 's@^.*\bcontent-disposition:.*\bfilename="([^"]+)".*$@\1@'
+  )
+
+  _pkgver_new=$(
+    printf '%s' "$_filename" \
+      | sed -E 's@^beeper-([0-9]+\.[0-9]+\.[0-9]+)(-.*)?.AppImage$@\1@'
+  )
+
+  # update _pkgver
+  if [ "$_pkgver" != "${_pkgver_new:?}" ] ; then
+    _pkgver="$_pkgver_new"
+  fi
 }
 
 # execute
diff --git a/beeper.sh b/beeper.sh
deleted file mode 100644
index c2f970a13a96..000000000000
--- a/beeper.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-_scriptdir="$(dirname `readlink -f "$0"`)"
-
-# Allow users to override command-line options
-if [[ -f "$XDG_CONFIG_HOME/beeper-flags.conf" ]]; then
-   _USER_FLAGS="$(cat $XDG_CONFIG_HOME/beeper-flags.conf)"
-fi
-
-# Launch
-exec electron "${_scriptdir:?}/resources/app.asar" ${_USER_FLAGS} "$@"