[arch-commits] Commit in obsidian/trunk (4 files)

[Sven-Hendrik Haase]

    Date: Monday, March 7, 2022 @ 22:56:47
  Author: svenstaro
Revision: 1145271

upgpkg: obsidian 0.13.30-2: Fix wrong electron version being used (FS#74053)

Added:
  obsidian/trunk/obsidian.sh
Modified:
  obsidian/trunk/PKGBUILD
  obsidian/trunk/obsidian.desktop
Deleted:
  obsidian/trunk/obsidian

------------------+
 PKGBUILD         |   15 ++++++---------
 obsidian         |    2 --
 obsidian.desktop |    1 -
 obsidian.sh      |    2 ++
 4 files changed, 8 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-07 22:54:59 UTC (rev 1145270)
+++ PKGBUILD	2022-03-07 22:56:47 UTC (rev 1145271)
@@ -4,7 +4,7 @@
 
 pkgname=obsidian
 pkgver=0.13.30
-pkgrel=1
+pkgrel=2
 pkgdesc="A powerful knowledge base that works on top of a local folder of plain text Markdown files"
 arch=('x86_64')
 url="https://obsidian.md/"
@@ -13,12 +13,12 @@
 makedepends=('asar')
 options=(!strip)
 source=(
-    "${pkgname}"
+    "${pkgname}.sh"
     "${pkgname}.desktop"
     "https://github.com/obsidianmd/obsidian-releases/releases/download/v${pkgver}/obsidian-${pkgver}.tar.gz"
 )
-sha256sums=('5f4699e03045f68932e976727a746342f971eddb77fe5a31d8d2c4084034ed5f'
-            '1153b7f4ce342663f766efa38dc07677aec13f7f619afef1f9b8e2b1f1849fe6'
+sha256sums=('4c6a634231c4ca95d8f0684a3ce755f38a45ff499589a2797023ea5c9cd0bf13'
+            'be67713e873a5935d910efc6f6005c104b35c7b3a002dfcb5643fd185d1b0056'
             'ca676a7430fb5967e897f8cb06ccfcb44cdc37b11dd47488ae4b80e7572f28ac')
 
 prepare() {
@@ -29,12 +29,8 @@
 package() {
     cd "$srcdir"
 
-    # Create directories for installation
-    install -dm0755 "$pkgdir"/usr/bin
-    install -dm0755 "$pkgdir"/usr/lib/obsidian
-
     # Install executable file
-    install -Dm755 "$pkgname" "$pkgdir"/usr/bin/
+    install -Dm755 "$pkgname".sh "$pkgdir"/usr/bin/obsidian
 
     # Install desktop file
     install -Dm644 "$pkgname".desktop -t "$pkgdir"/usr/share/applications/
@@ -43,6 +39,7 @@
     # Most of the release package is electron, but we use system's default one
     # So strip away asar packages and put them to /usr/lib/
     cd "${pkgname}-${pkgver}"/resources/
+    install -dm0755 "$pkgdir"/usr/lib/obsidian
     find . -type d -exec install -d {,"$pkgdir"/usr/lib/obsidian/}{} \;
     find . -type f -exec install -D {,"$pkgdir"/usr/lib/obsidian/}{} \;
 }

Deleted: obsidian
===================================================================
--- obsidian	2022-03-07 22:54:59 UTC (rev 1145270)
+++ obsidian	2022-03-07 22:56:47 UTC (rev 1145271)
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /bin/electron13 /usr/lib/obsidian/app.asar "$@"

Modified: obsidian.desktop
===================================================================
--- obsidian.desktop	2022-03-07 22:54:59 UTC (rev 1145270)
+++ obsidian.desktop	2022-03-07 22:56:47 UTC (rev 1145271)
@@ -5,7 +5,6 @@
 Type=Application
 Icon=obsidian
 StartupWMClass=obsidian
-X-AppImage-Version=0.12.5
 Comment=Obsidian
 MimeType=x-scheme-handler/obsidian;
 Categories=Office;

Added: obsidian.sh
===================================================================
--- obsidian.sh	                        (rev 0)
+++ obsidian.sh	2022-03-07 22:56:47 UTC (rev 1145271)
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /bin/electron16 /usr/lib/obsidian/app.asar "$@"