From f8f51b8f12bed9db74520eb64abb650c6bef9158 Mon Sep 17 00:00:00 2001
From: Alfredo Palhares <alfredo@palhares.me>
Date: Sat, 19 Dec 2020 23:15:20 +0000
Subject: [PATCH] upgpkg: joplin 1.4.19-10

Use new naming
---
 .SRCINFO       |  8 +++-----
 PKGBUILD       | 11 +++++------
 joplin.install |  4 ++--
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index a8bae0d..2ef6457 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = joplin
 	pkgdesc = A note taking and to-do application with synchronization capabilities - Split Package
 	pkgver = 1.4.19
-	pkgrel = 9
+	pkgrel = 10
 	url = https://joplinapp.org/
 	install = joplin.install
 	arch = x86_64
@@ -13,8 +13,6 @@ pkgbase = joplin
 	makedepends = python
 	makedepends = rsync
 	makedepends = electron
-	conflicts = joplin-cli
-	conflicts = joplin-desktop
 	source = joplin.desktop
 	source = joplin-desktop.sh
 	source = joplin.sh
@@ -24,12 +22,12 @@ pkgbase = joplin
 	sha256sums = 5b6f8847ec0c3848375755213c3009c273f478b4b80ed2c5f0af8f67ee0e94fb
 	sha256sums = 55aad4fe50e2da980983a69bc7c0870626064db971550d522e266feb17d38916
 
-pkgname = joplin
+pkgname = joplin-cli
 	pkgdesc = A note taking and to-do application with synchronization capabilities - CLI App
 	depends = nodejs
 	depends = rsync
 
-pkgname = joplin-desktop-electron
+pkgname = joplin-desktop
 	pkgdesc = A note taking and to-do application with synchronization capabilities - Desktop
 	depends = electron
 	depends = gtk3
diff --git a/PKGBUILD b/PKGBUILD
index d7cbb0a..421b7ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,14 +5,13 @@
 # https://github.com/alfredopalhares/arch-pkgbuilds
 
 pkgbase="joplin"
-pkgname=('joplin' 'joplin-desktop-electron')
+pkgname=('joplin-cli' 'joplin-desktop')
 pkgver=1.4.19
 groups=('joplin')
-pkgrel=9
+pkgrel=10
 install="joplin.install"
 pkgdesc="A note taking and to-do application with synchronization capabilities - Split Package"
 arch=('x86_64' 'i686')
-conflicts=('joplin-cli' 'joplin-desktop')
 makedepends=('git' 'npm' 'python' 'rsync' 'electron')
 url="https://joplinapp.org/"
 license=('MIT')
@@ -45,7 +44,7 @@ check() {
 }
 
 #TODO: A slimdown is needed
-package_joplin() {
+package_joplin-cli() {
   pkgdesc="A note taking and to-do application with synchronization capabilities - CLI App"
   depends=('nodejs' 'rsync')
 
@@ -92,7 +91,7 @@ package_joplin() {
   install -Dm755 joplin.sh "${pkgdir}/usr/bin/joplin-cli"
 }
 
-package_joplin-desktop-electron() {
+package_joplin-desktop() {
   pkgdesc="A note taking and to-do application with synchronization capabilities - Desktop"
   depends=('electron' 'gtk3' 'libexif' 'libgsf' 'libjpeg-turbo' 'libwebp' 'libxss' 'nodejs'
          'nss' 'orc')
@@ -114,7 +113,7 @@ package_joplin-desktop-electron() {
   cd "${srcdir}/joplin-${pkgver}/"
   install -Dm644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
 
-  msg2 "Installing startup script and desktop file..." 
+  msg2 "Installing startup script and desktop file..."
   cd "${srcdir}"
   install -Dm755 ${srcdir}/joplin-desktop.sh "${pkgdir}/usr/bin/joplin-desktop"
   install -Dm644 ${srcdir}/joplin.desktop -t "${pkgdir}/usr/share/applications"
diff --git a/joplin.install b/joplin.install
index c857b2b..d12d9d1 100644
--- a/joplin.install
+++ b/joplin.install
@@ -7,7 +7,7 @@
 post_install() {
    echo "This is now a split Package:"
    echo "joplin for a CLI version"
-   echo "joplin-desktop-electron for a Desktop version"
+   echo "joplin-desktop for a Desktop version"
    echo "You may need to install them explicity on some AUR helpers"
 }
 
@@ -22,7 +22,7 @@ post_install() {
 post_upgrade() {
    echo "This is now a split Package:"
    echo "joplin for a CLI version"
-   echo "joplin-desktop-electron for a Desktop version"
+   echo "joplin-desktop for a Desktop version"
    echo "You may need to install them explicity on some AUR helpers"
 }