Update 1.3.1-2

2 files changed, 56 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8d2b889314e4..b8e359c14988 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,29 @@
 pkgbase = mark-mind
 	pkgdesc = Mark Mind — Next generation mind map editor
 	pkgver = 1.3.1
-	pkgrel = 1
-	url = https://github.com/MarkMindLtd/Mark-Mind
+	pkgrel = 2
+	url = https://github.com/MarkMindCkm/Mark-Mind
 	arch = any
 	license = MIT
-	makedepends = coreutils
-	depends = electron9
-	provides = mark-mind
-	conflicts = mark-mind
-	replaces = mark-mind
 	options = !strip
-	source = Mark-Mind-1.3.1.AppImage::https://github.com/MarkMindLtd/Mark-Mind/releases/download/v1.3.1/Mark.Mind-1.3.1.AppImage
+	source = Mark-Mind-1.3.1.tar.gz::https://github.com/MarkMindCkm/Mark-Mind/archive/refs/tags/v1.3.1.tar.gz
+	source = Mark-Mind-1.3.1.AppImage::https://github.com/MarkMindCkm/Mark-Mind/releases/download/v1.3.1/Mark.Mind-1.3.1.AppImage
 	source = io.github.markmindltd.mark_mind.desktop
 	source = io.github.markmindltd.mark_mind.metainfo.xml
+	sha256sums = c51bc35ebcca1416fb3b41059abb33931db43a2efca070e931d5971d85f1921e
 	sha256sums = 88e27420e23395e03af6bbfde10777e6b31b1dcf974a2f0e3dab5fd95eac62b2
 	sha256sums = bc8c6db34688ad87879871a9ea28c088a1f44fcdfb7f4e4aef52a425283dde9f
 	sha256sums = c0050afe68a3c62cc8f15508b1209a41eae4cbd7e358a0bf0ae20bc37178f35f
 
 pkgname = mark-mind
+	pkgdesc = Mark Mind — Next generation mind map editor (electron)
+	depends = electron
+	depends = coreutils
+	depends = npm
+	provides = mark-mind
+	conflicts = mark-mind
+
+pkgname = mark-mind-appimage
+	pkgdesc = Mark Mind — Next generation mind map editor (AppImage)
+	provides = mark-mind-appimage
+	conflicts = mark-mind-appimage
diff --git a/PKGBUILD b/PKGBUILD
index ce48dde95b9f..7b72a7f24b2d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,49 +2,62 @@
 
 _pkgname=Mark-Mind
 _gitpkgname=Mark.Mind
-pkgname=mark-mind
+pkgbase=mark-mind
+pkgname=(mark-mind{,-appimage})
 pkgver=1.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Mark Mind — Next generation mind map editor"
 arch=('any')
-url="https://github.com/MarkMindLtd/Mark-Mind"
+url="https://github.com/MarkMindCkm/Mark-Mind"
 license=('MIT')
-provides=(${pkgname})
-conflicts=(${pkgname})
-replaces=(${pkgname})
-depends=('electron9')
-makedepends=('coreutils')
+makedepends=()
 backup=()
 options=('!strip')
-source=("${_pkgname}-${pkgver}.AppImage::https://github.com/MarkMindLtd/${_pkgname}/releases/download/v${pkgver//_/-}/${_gitpkgname}-${pkgver}.AppImage"
+source=("${_pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz"
+    "${_pkgname}-${pkgver}.AppImage::${url}/releases/download/v${pkgver//_/-}/${_gitpkgname}-${pkgver}.AppImage"
     "io.github.markmindltd.mark_mind.desktop"
     "io.github.markmindltd.mark_mind.metainfo.xml")
-sha256sums=('88e27420e23395e03af6bbfde10777e6b31b1dcf974a2f0e3dab5fd95eac62b2'
+sha256sums=('c51bc35ebcca1416fb3b41059abb33931db43a2efca070e931d5971d85f1921e'
+            '88e27420e23395e03af6bbfde10777e6b31b1dcf974a2f0e3dab5fd95eac62b2'
             'bc8c6db34688ad87879871a9ea28c088a1f44fcdfb7f4e4aef52a425283dde9f'
             'c0050afe68a3c62cc8f15508b1209a41eae4cbd7e358a0bf0ae20bc37178f35f')
 
-prepare() {
-    chmod u+x "${srcdir}/${_pkgname}-${pkgver}.AppImage"
+_install_path="/opt/appimages"
+
+package_mark-mind() {
+    pkgdesc+=" (electron)"
+    provides=(${pkgname})
+    conflicts=(${pkgname})
+
+    depends=(electron
+            coreutils
+            npm)
 
-    "${srcdir}/${_pkgname}-${pkgver}.AppImage" --appimage-extract
+    install -Dm 0644 "${srcdir}/io.github.markmindltd.mark_mind.desktop" "${pkgdir}/usr/share/applications/io.github.markmindltd.mark_mind.desktop"
+    install -Dm 0644 "${srcdir}/io.github.markmindltd.mark_mind.metainfo.xml" "${pkgdir}/usr/share/metainfo/io.github.markmindltd.mark_mind.metainfo.xml"
+
+    npm install -g --prefix "${pkgdir}/usr" "${srcdir}/${_pkgname}-${pkgver}.tar.gz"
+    # npm gives ownership of ALL FILES to build user
+    # https://bugs.archlinux.org/task/63396
+    chown -R root:root "${pkgdir}"
 }
 
-package() {
-#     find ${srcdir}/squashfs-root/locales/ -type d -exec chmod 755 {} +
-     find ${srcdir}/squashfs-root/resources/ -type d -exec chmod 755 {} +
+package_mark-mind-appimage() {
+    pkgdesc+=" (AppImage)"
+    provides=(${pkgname})
+    conflicts=(${pkgname})
 
-    install -Dm 0755 "${srcdir}/squashfs-root/resources/app.asar"  "${pkgdir}/opt/${pkgname}/${pkgname}.asar"
-    cp -r "${srcdir}/squashfs-root/resources/app.asar.unpacked"  "${pkgdir}/opt/${pkgname}"
+    chmod u+x "${srcdir}/${_pkgname}-${pkgver}.AppImage"
+    "${srcdir}/${_pkgname}-${pkgver}.AppImage" --appimage-extract > /dev/null
+    sed 's|AppRun|/opt/appimages/mark-mind-appimage.AppImage|g' -i "${srcdir}/squashfs-root/mind.desktop"
 
-    install -Dm 0755 /dev/stdin "${pkgdir}/usr/bin/${pkgname}" << EOF
-#!/usr/bin/env bash
-electron9 /opt/${pkgname}/${pkgname}.asar
-EOF
+    install -Dm755 "${srcdir}"/${_pkgname}-${pkgver}.AppImage "${pkgdir}"/${_install_path}/${pkgname}.AppImage
+    local _icon
+    for _icon in 16 32 48 64 128 256 512; do
+        install -Dm0644 "${srcdir}/squashfs-root/usr/share/icons/hicolor/${_icon}x${_icon}/apps/mind.png" \
+                    -t  "${pkgdir}/usr/share/icons/hicolor/${_icon}x${_icon}/apps"
+    done
 
-    find "${srcdir}/squashfs-root/usr/share/icons/" -type d -exec chmod 755 {} +
-    install -dm 0755 "${pkgdir}/usr/share/icons"
-    cp -r "${srcdir}/squashfs-root/usr/share/icons/hicolor" "${pkgdir}/usr/share/icons/hicolor"
+    install -Dm644 "${srcdir}/squashfs-root/mind.desktop" -t "${pkgdir}/usr/share/applications"
 
-    install -Dm 0644 "${srcdir}/io.github.markmindltd.mark_mind.desktop" "${pkgdir}/usr/share/applications/io.github.markmindltd.mark_mind.desktop"
-    install -Dm 0644 "${srcdir}/io.github.markmindltd.mark_mind.metainfo.xml" "${pkgdir}/usr/share/metainfo/io.github.markmindltd.mark_mind.metainfo.xml"
 }