Refactoring

1 files changed, 20 insertions, 9 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3ac75cc08c70..c6dcaa64073d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,11 @@
 
 pkgname=obsidian-insider
 _pkgname=obsidian
+# Insider release (lacks app.asar)
 pkgver=0.11.10
-pkgrel=1
+# Full public release
+_pkgver=0.11.9
+pkgrel=2
 pkgdesc="Obsidian is a powerful knowledge base that works on top of a local folder of plain text Markdown files"
 provides=("${_pkgname}")
 arch=('x86_64')
@@ -16,17 +19,19 @@ options=(!strip)
 source=(
     "${pkgname}"
     "${pkgname}.desktop"
+    "https://github.com/obsidianmd/obsidian-releases/releases/download/v${_pkgver}/obsidian-${_pkgver}.tar.gz"
     "https://github.com/obsidianmd/obsidian-releases/releases/download/v${pkgver}/obsidian-${pkgver}.asar.gz"
 )
 sha256sums=(
     'e0a6a8f7dfbfff88664621448ac456d47e62c6d94e2cc59702c4f31968780ed4'
-    '85cd8b31a4dac91c3738d36c1fe47447612a1ca800edd98e19e8aec21c2a448b'
+    'b58f58a58278dc5eaddd0e935d973b69eb671d971db678c077892c7369a0f6e4'
+    '5f298cdea99af07d9d9b6b6af1983ea0ac4ecdbe3c6b3aa5aa7ef4d6937981d2'
     'afbc43520c04ab0e92efe7a77d349e05731c1ce0c1090571ad317f24fa48f715'
 )
 
 prepare() {
     cd "$srcdir"
-    asar ef ${_pkgname}-${pkgver}.asar icon.png
+    asar ef "${_pkgname}-${_pkgver}"/resources/obsidian.asar icon.png
 }
 
 package() {
@@ -35,14 +40,20 @@ package() {
 
     # Create directories for installation
     install -dm0755 "${pkgdir}/usr/bin"
-    install -dm0755 "${pkgdir}/usr/share/obsidian"
+    install -dm0755 "${pkgdir}/usr/lib/obsidian"
 
     # Install executable file
-    install -Dm755 ${pkgname} "${pkgdir}/usr/bin/"
+    install -Dm755 "$pkgname" "$pkgdir"/usr/bin/
     # Install desktop file
-    install -Dm644 ${pkgname}.desktop -t "${pkgdir}/usr/share/applications/"
-    install -Dm644 icon.png "${pkgdir}/usr/share/pixmaps/obsidian.png"
-    # Move package contents to opt
-    install -Dm644 ${_pkgname}-${pkgver}.asar "${pkgdir}/usr/share/${_pkgname}/app.asar"
+    install -Dm644 "$pkgname".desktop -t "$pkgdir"/usr/share/applications/
+    install -Dm644 icon.png "$pkgdir"/usr/share/pixmaps/obsidian.png
+    # 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/
+    find . -type d -exec install -d {,"$pkgdir"/usr/lib/obsidian/}{} \;
+    find . -type f -exec install -D -m 644 {,"$pkgdir"/usr/lib/obsidian/}{} \;
+    # Insider release provides only obsidian.asar, but is usually more recent
+    cd "$srcdir"
+    install -D -m 644 "${_pkgname}-${pkgver}.asar" "$pkgdir"/usr/lib/obsidian/obsidian.asar
 }