Made beaker-browser executable from the command line

5 files changed, 20 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0a1b2d72a1ba..73ae208a3584 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = beaker-browser-bin
 	pkgdesc = Peer-to-peer browser with tools to create and host websites
 	pkgver = 0.7.11
-	pkgrel = 1
+	pkgrel = 2
 	url = https://beakerbrowser.com/
+	install = beaker-browser-bin.install
 	arch = x86_64
 	license = Modified MIT License (MIT)
 	provides = beaker-browser
@@ -10,11 +11,11 @@ pkgbase = beaker-browser-bin
 	options = !strip
 	source = https://github.com/beakerbrowser/beaker/releases/download/0.7.11/beaker-browser-0.7.11-x86_64.AppImage
 	source = beaker-browser.desktop
-	source = beaker-browser.sh
+	source = beaker-browser
 	source = beaker.png
 	source = LICENSE
 	md5sums = 230f726139d12a40f98d078904ea162d
-	md5sums = 9b63b4e9b329c43ccbf4c9fda09afbd0
+	md5sums = 3a79182ba0232d6715b170e92b6e523f
 	md5sums = 6294b99dbab87ee048a65a202dd05d9b
 	md5sums = 9cbb1795dc2934472f7c2b021294964d
 	md5sums = 3862c029863f42c81265a712f9c17c4c
diff --git a/PKGBUILD b/PKGBUILD
index e59ee379a1d1..1b4030619bcd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Your Name <jc.francois@gmail.com>
 pkgname=beaker-browser-bin
 pkgver=0.7.11
-pkgrel=1
+pkgrel=2
 pkgdesc="Peer-to-peer browser with tools to create and host websites"
 arch=('x86_64')
 url="https://beakerbrowser.com/"
@@ -12,23 +12,25 @@ backup=()
 options=(!strip)
 source=("https://github.com/beakerbrowser/beaker/releases/download/${pkgver}/beaker-browser-${pkgver}-${arch}.AppImage"
         "beaker-browser.desktop"
-        "beaker-browser.sh"
+        "beaker-browser"
         "beaker.png"
         "LICENSE")
 noextract=()
 md5sums=('230f726139d12a40f98d078904ea162d'
-         '9b63b4e9b329c43ccbf4c9fda09afbd0'
+         '3a79182ba0232d6715b170e92b6e523f'
          '6294b99dbab87ee048a65a202dd05d9b'
          '9cbb1795dc2934472f7c2b021294964d'
          '3862c029863f42c81265a712f9c17c4c')
 
+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.sh                          ${pkgdir}/opt/beaker-browser/beaker-browser.sh
+    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
 }
 
 # Possible alternative to deleting unwanted files at every run:
-# install /usr/share/appimagekit/no_desktopintegration to prevent installation (but from ALL AppImages)
+# touch /usr/share/appimagekit/no_desktopintegration to prevent installation (but from ALL AppImages)
diff --git a/beaker-browser.sh b/beaker-browser
index 5a055fb5e47c..5a055fb5e47c 100755
--- a/beaker-browser.sh
+++ b/beaker-browser
diff --git a/beaker-browser-bin.install b/beaker-browser-bin.install
new file mode 100644
index 000000000000..48e46359bdad
--- /dev/null
+++ b/beaker-browser-bin.install
@@ -0,0 +1,8 @@
+
+# Remove bash script that was installed in /opt/beaker-browser before v0.7.11-2
+post_upgrade() {
+    if [ -e /opt/beaker-browser/beaker-browser.sh ];
+    then
+        rm /opt/beaker-browser/beaker-browser.sh;
+    fi
+}
diff --git a/beaker-browser.desktop b/beaker-browser.desktop
index 4de5e07f3141..84b01174fed3 100644
--- a/beaker-browser.desktop
+++ b/beaker-browser.desktop
@@ -2,7 +2,7 @@
 Name=beaker-browser
 Comment=Peer-to-peer browser with tools to create and host website
 GenericName=Beaker Browser
-Exec=/opt/beaker-browser/beaker-browser.sh
+Exec=/usr/bin/beaker-browser
 Icon=beaker
 Type=Application
 StartupNotify=true