瀏覽代碼

Fix wrong electron version being used (FS#74053)

Sven-Hendrik Haase 3 年之前
父節點
當前提交
14ad20cf34
共有 4 個文件被更改,包括 8 次插入12 次删除
  1. 6 9
      PKGBUILD
  2. 0 2
      obsidian
  3. 0 1
      obsidian.desktop
  4. 2 0
      obsidian.sh

+ 6 - 9
PKGBUILD

@@ -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 @@ depends=('zlib' 'hicolor-icon-theme' 'fuse' 'electron16')
 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 @@ prepare() {
 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 @@ package() {
     # 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/}{} \;
 }

+ 0 - 2
obsidian

@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /bin/electron13 /usr/lib/obsidian/app.asar "$@"

+ 0 - 1
obsidian.desktop

@@ -5,7 +5,6 @@ Terminal=false
 Type=Application
 Icon=obsidian
 StartupWMClass=obsidian
-X-AppImage-Version=0.12.5
 Comment=Obsidian
 MimeType=x-scheme-handler/obsidian;
 Categories=Office;

+ 2 - 0
obsidian.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /bin/electron16 /usr/lib/obsidian/app.asar "$@"