return to packaged electron

2 files changed, 12 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index edf77016d9fb..e4a0b3d8e4df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,12 @@
 pkgbase = logseq-desktop-bin
 	pkgdesc = Privacy-first, open-source platform for knowledge sharing and management
 	pkgver = 0.10.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/logseq/logseq
 	install = logseq-desktop.install
 	arch = x86_64
 	license = AGPL3
-	makedepends = asar
 	makedepends = gendesk
-	depends = electron
 	provides = logseq-desktop
 	conflicts = logseq-desktop
 	source = https://github.com/logseq/logseq/releases/download/0.10.0/Logseq-linux-x64-0.10.0.zip
diff --git a/PKGBUILD b/PKGBUILD
index d164e74c2714..be1e5a42032f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,15 +7,13 @@
 _pkgname=logseq-desktop
 pkgname="$_pkgname${_pkgtype:+-$_pkgtype}"
 pkgver=0.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Privacy-first, open-source platform for knowledge sharing and management"
 url="https://github.com/logseq/logseq"
 license=('AGPL3')
 arch=("x86_64")
 
-depends=('electron')
 makedepends=(
-  'asar'
   'gendesk'
 )
 
@@ -37,21 +35,18 @@ prepare() {
 #!/usr/bin/env sh
 set -e
 
-APPDIR="/usr/lib/logseq-desktop"
-XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
-
-_ELECTRON=/usr/bin/electron
-_ASAR="${APPDIR}/app.asar"
-_FLAGS_FILE="$XDG_CONFIG_HOME/logseq-flags.conf"
+APPDIR="/opt/logseq-desktop"
+_ELECTRON="${APPDIR}/Logseq"
 
+_FLAGS_FILE="${XDG_CONFIG_HOME:-$HOME/.config}/logseq-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 "$@"
+    exec ${_ELECTRON} $_USER_FLAGS "$@"
 else
-    exec ${_ELECTRON} ${_ASAR} --no-sandbox $_USER_FLAGS "$@"
+    exec ${_ELECTRON} --no-sandbox $_USER_FLAGS "$@"
 fi
 EOF
 
@@ -72,7 +67,12 @@ EOF
   gendesk "${_gendesk_options[@]}"
 }
 
+
 package() {
+  # copy files
+  install -dm755 "$pkgdir/opt/$_pkgname"
+  cp -r "$srcdir/$_pkgsrc"/* "$pkgdir/opt/$_pkgname/"
+
   # desktop file
   install -Dm644 "$_pkgname.desktop" "$pkgdir/usr/share/applications/logseq-desktop.desktop"
 
@@ -80,10 +80,6 @@ package() {
   install -Dm644 "$_pkgsrc/resources/app/icons/logseq.png" \
     -t "$pkgdir/usr/share/pixmaps/"
 
-  # asar
-  install -dm755 "$pkgdir/usr/lib/$_pkgname"
-  asar pack "$_pkgsrc/resources/app" "$pkgdir/usr/lib/$_pkgname/app.asar"
-
   # script
   install -Dm755 "logseq-desktop.sh" "$pkgdir/usr/bin/logseq"
 }