Fully redid package() method

3 files changed, 41 insertions, 14 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 684bb679d035..2f9213ceac39 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,14 @@
 # Maintainer: Guus van Meerveld <contact@guusvanmeerveld.dev>
-pkgbase='dust-mail-client'
 pkgname=('dust-mail-client-git')
 
 arch=('x86_64')
 
-pkgver=0.1.3.r1.g445a19b
+pkgdesc='A simple and fast mail client (Git version)'
+
+conflicts=('dust-mail-client')
+provides=('dust-mail-client')
+
+pkgver=0.1.4.r2.gef28602
 pkgver() {
   cd "$pkgname"
   git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
@@ -12,24 +16,40 @@ pkgver() {
 pkgrel=1
 epoch=1
 
-makedepends=('nodejs>=16.0.0' 'yarn' 'cargo' 'git' 'appstream')
+makedepends=('yarn' 'nvm' 'cargo' 'git' 'appstream')
 
 url='https://github.com/Guusvanmeerveld/Dust-Mail'
 
 license=('MIT')
 
-source=("$pkgname::git+https://github.com/Guusvanmeerveld/Dust-Mail.git")
+source=("$pkgname::git+https://github.com/Guusvanmeerveld/Dust-Mail.git" "dust-mail.desktop" "dust-mail.png")
+
+md5sums=('SKIP' '225f3614b306b30c1bf515ee42c68109' '1c7baa069d5b6aea65b43e37728abbcd')
+sha256sums=('SKIP' 'SKIP' 'SKIP')
 
-sha512sums=('SKIP')
-md5sums=('SKIP')
+_ensure_local_nvm() {
+    # let's be sure we are starting clean
+    which nvm >/dev/null 2>&1 && nvm deactivate && nvm unload
+    export NVM_DIR="${srcdir}/.nvm"
+
+    # The init script returns 3 if version specified
+    # in ./.nvrc is not (yet) installed in $NVM_DIR
+    # but nvm itself still gets loaded ok
+    source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
+}
 
 prepare() {
+  _ensure_local_nvm
+  nvm install 16
+
   cd "$srcdir/$pkgname/packages/client/src-tauri"
 
   cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
 }
 
 build() {
+  _ensure_local_nvm
+
   cd "$pkgname/packages/client"
 
   yarn install --frozen-lockfile
@@ -38,14 +58,13 @@ build() {
 
   export RUSTUP_TOOLCHAIN=1.61
 
-  yarn run tauri build
-}
+  export VITE_UNSTABLE=true
 
-package_dust-mail-client-git() {
-  pkgdesc='A simple and fast mail client (Git version)'
-
-  conflicts=('dust-mail-client')
-  provides=('dust-mail-client')
+  yarn run tauri build --verbose
+}
 
-  cp "$srcdir/$pkgname/packages/client/src-tauri/target/release/bundle/deb/${pkgbase}_0.1.0_amd64/data/usr" "$pkgdir" -r
+package() {
+  install -Dm644 "$srcdir/dust-mail.desktop" "$pkgdir/usr/share/applications/dust-mail-client.desktop"
+  install -Dm644 "$srcdir/dust-mail.png" "$pkgdir/usr/share/dust-mail.png"
+  install -Dm755 "$srcdir/$pkgname/packages/client/src-tauri/target/release/dust-mail" "$pkgdir/usr/bin/dust-mail-client"
 }
diff --git a/dust-mail.desktop b/dust-mail.desktop
new file mode 100644
index 000000000000..54e14d392f15
--- /dev/null
+++ b/dust-mail.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Categories=Office;
+Comment=A simple and fast mail client
+Exec=dust-mail-client
+Icon=dust-mail
+Name=Dust-Mail
+Terminal=false
+Type=Application
diff --git a/dust-mail.png b/dust-mail.png
new file mode 100644
index 000000000000..b7dcb5c7b327
--- /dev/null
+++ b/dust-mail.png