Unpack AppImage and use local electron installation to resolve some segfault issues

6 files changed, 40 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5a02d0cc3c56..c38b5d30ceda 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,23 @@
 pkgbase = beaker-browser-bin
 	pkgdesc = Peer-to-peer browser with tools to create and host websites
 	pkgver = 0.8.0_prerelease.7
-	pkgrel = 2
+	pkgrel = 3
 	url = https://beakerbrowser.com/
 	install = beaker-browser-bin.install
 	arch = x86_64
 	license = Modified MIT License (MIT)
+	depends = libxss
+	depends = libxtst
+	depends = libnotify
+	depends = gconf
+	depends = electron
 	provides = beaker-browser
 	provides = beakerbrowser
 	options = !strip
 	source = https://github.com/beakerbrowser/beaker/releases/download/0.8.0-prerelease.7/beaker-browser-0.8.0-prerelease.7-x86_64.AppImage
 	source = beaker-browser.desktop
-	source = beaker-browser
-	source = beaker.png
-	source = LICENSE
 	md5sums = 29ce7033348b13431fea4dfbe2fa94fc
-	md5sums = b10231529d8728fda5cadec2363d1ed1
-	md5sums = cb6c4917ea8c4e6eb037d7167b76410c
-	md5sums = 9cbb1795dc2934472f7c2b021294964d
-	md5sums = 3862c029863f42c81265a712f9c17c4c
+	md5sums = 34b48b022c6c71212f0adb3981f2925d
 
 pkgname = beaker-browser-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 83ba8dd5deaf..74f56ed5d119 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,40 @@
 # Maintainer: JC Francois <jc.francois@gmail.com>
 pkgname=beaker-browser-bin
 pkgver=0.8.0_prerelease.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Peer-to-peer browser with tools to create and host websites"
 arch=('x86_64')
 url="https://beakerbrowser.com/"
 license=('Modified MIT License (MIT)')
 provides=('beaker-browser' 'beakerbrowser')
+depends=('libxss' 'libxtst' 'libnotify' 'gconf' 'electron')
 backup=()
 
 options=(!strip)
 source=("https://github.com/beakerbrowser/beaker/releases/download/${pkgver//_/-}/beaker-browser-${pkgver//_/-}-${arch}.AppImage"
-        "beaker-browser.desktop"
-        "beaker-browser"
-        "beaker.png"
-        "LICENSE")
+        "beaker-browser.desktop")
 noextract=()
 md5sums=('29ce7033348b13431fea4dfbe2fa94fc'
-         'b10231529d8728fda5cadec2363d1ed1'
-         'cb6c4917ea8c4e6eb037d7167b76410c'
-         '9cbb1795dc2934472f7c2b021294964d'
-         '3862c029863f42c81265a712f9c17c4c')
+         '34b48b022c6c71212f0adb3981f2925d')
 
 install='beaker-browser-bin.install'
 
-package() {
-    install -Dm644 ${srcdir}/beaker-browser.desktop                         ${pkgdir}/usr/share/applications/beaker-browser.desktop
-    install -Dm644 ${srcdir}/beaker.png                                     ${pkgdir}/usr/share/icons/hicolor/48x48/apps/beaker.png
-    install -Dm444 ${srcdir}/LICENSE                                        ${pkgdir}/usr/share/LICENSES/beaker-browser/LICENSE
-    install -Dm755 ${srcdir}/beaker-browser                                 ${pkgdir}/usr/bin/beaker-browser
-    install -Dm755 ${srcdir}/beaker-browser-${pkgver//_/-}-${arch}.AppImage ${pkgdir}/opt/beaker-browser/beaker-browser.AppImage
+prepare() {
+    chmod u+x beaker-browser-${pkgver//_/-}-${arch}.AppImage
+    ./beaker-browser-${pkgver//_/-}-${arch}.AppImage --appimage-extract
 }
 
-# Possible alternative to deleting unwanted files at every run:
-# touch /usr/share/appimagekit/no_desktopintegration to prevent installation (but from ALL AppImages)
+package() {
+    find            ${srcdir}/squashfs-root/app/ -type d -exec chmod 755 {} +
+    install -d      ${pkgdir}/opt/beaker-browser
+    cp -r           ${srcdir}/squashfs-root/app/*                       ${pkgdir}/opt/beaker-browser
+ 
+    find            ${srcdir}/squashfs-root/usr/share/icons/ -type d -exec chmod 755 {} +
+    install -d      ${pkgdir}/usr/share/icons
+    cp -r           ${srcdir}/squashfs-root/usr/share/icons/hicolor     ${pkgdir}/usr/share/icons/hicolor              
+
+    install -Dm644  ${srcdir}/beaker-browser.desktop                    ${pkgdir}/usr/share/applications/beaker-browser.desktop
+
+    install -Dm755  ${srcdir}/beaker-browser                            ${pkgdir}/usr/bin/beaker-browser
+    install -Dm444  ${srcdir}/LICENSE                                   ${pkgdir}/usr/share/LICENSES/beaker-browser/LICENSE
+}
diff --git a/beaker-browser b/beaker-browser
index 8667938d9d4d..a0cc55e79d76 100755
--- a/beaker-browser
+++ b/beaker-browser
@@ -1,26 +1,4 @@
 #!/bin/bash
 
-# Avoid that install dialog is shown when starting browser
-export APPIMAGE_SILENT_INSTALL=1
-
-# Fix for crash on Arch linux
-export ELECTRON_PATH=/usr/bin/electron
-
-# Launch AppImage application
-/opt/beaker-browser/beaker-browser.AppImage
-
-# Since launching the AppImage performs the installation silently
-# remove files that have been installed locally after run
-if [ -e ~/.local/share/applications/appimagekit-beaker-browser.desktop ];
-then
-    rm ~/.local/share/applications/appimagekit-beaker-browser.desktop;
-
-    prefix=~/.local/share/icons/hicolor/
-    resolutions=(16x16 24x24 32x32 48x48 64x64 96x96 128x128 256x256 512x512 1024x1024)
-    postfix=/apps/appimagekit-beaker-browser.png
-
-    for i in {0..9};
-    do
-        rm ${prefix}${resolutions[$i]}${postfix};
-    done
-fi
+# Launch application
+/usr/bin/electron /opt/beaker-browser/resources/app.asar
\ No newline at end of file
diff --git a/beaker-browser-bin.install b/beaker-browser-bin.install
index 48e46359bdad..c13a69011798 100644
--- a/beaker-browser-bin.install
+++ b/beaker-browser-bin.install
@@ -1,8 +1,14 @@
 
-# Remove bash script that was installed in /opt/beaker-browser before v0.7.11-2
 post_upgrade() {
+    # Remove bash script that was installed before v0.7.11-2
     if [ -e /opt/beaker-browser/beaker-browser.sh ];
     then
         rm /opt/beaker-browser/beaker-browser.sh;
     fi
+    # Remove AppImage that was installed prior to v0.8.0-prerelease.7-3
+    if [ -e /opt/beaker-browser/beaker-browser.AppImage ];
+    then
+        rm /opt/beaker-browser/beaker-browser.AppImage;
+    fi
+
 }
diff --git a/beaker-browser.desktop b/beaker-browser.desktop
index d47189fa6796..d40e3b1c8f46 100644
--- a/beaker-browser.desktop
+++ b/beaker-browser.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Name=Beaker Browser
 Comment=Peer-to-peer browser with tools to create and host website
-GenericName=Beaker Browser
+GenericName=Web Browser
 Exec=/usr/bin/beaker-browser
-Icon=beaker
+Icon=beaker-browser
 Type=Application
 StartupNotify=true
 Terminal=false
 Categories=Development;Network;WebBrowser;
 Keywords=web;browser;internet;p2p;
-MimeType=text/html;x-scheme-handler/http;x-scheme-handler/https;
+MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/dat;video/webm;application/x-xpinstall;
diff --git a/beaker.png b/beaker.png
deleted file mode 100644
index 2c768403eb6e..000000000000
--- a/beaker.png
+++ /dev/null