summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorZach Himsel2023-02-13 10:37:42 -0500
committerZach Himsel2023-02-13 11:16:13 -0500
commitffaf96dbc118b90f6ca2f81079fb9ca512daf7a7 (patch)
tree0bfc0042084fc57c3bdabb9652f5ab7f021c250d
parent215189a277189af3f0b2238272a18cb09b926dc3 (diff)
downloadaur-ffaf96dbc118b90f6ca2f81079fb9ca512daf7a7.tar.gz
Don't use yarn to start the program
See this comment by @BrainDamage: https://aur.archlinux.org/packages/mqtt-explorer#comment-857588
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD23
-rwxr-xr-xmqtt-explorer-run.sh2
-rw-r--r--mqtt-explorer.desktop11
4 files changed, 26 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0b90f1576c14..c39e2340d7dc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,18 @@
pkgbase = mqtt-explorer
pkgdesc = A comprehensive and easy-to-use MQTT Client
pkgver = 0.3.5
- pkgrel = 9
+ pkgrel = 10
url = https://mqtt-explorer.com/
arch = any
license = CCPL:by-nd
makedepends = git
+ makedepends = npm
makedepends = sed
- depends = npm
- depends = yarn
+ makedepends = yarn
+ depends = nodejs
conflicts = mqtt-explorer-beta
options = !strip
source = mqtt-explorer-0.3.5.tar.gz::https://github.com/thomasnordquist/MQTT-Explorer/archive/v0.3.5.tar.gz
- source = mqtt-explorer-0.3.5-desktop.tar.gz::https://github.com/dave12311/mqtt-explorer.desktop/archive/1.1.tar.gz
md5sums = 66b04e6991416cf8be67c0d8c3706477
- md5sums = 306a5ee73ab04fee5eb0f8202d2d90a1
pkgname = mqtt-explorer
diff --git a/PKGBUILD b/PKGBUILD
index 758deaa1e9bd..b15825d921f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,27 @@
# Maintainer: Zach Himsel <zach at himsel dot net>
pkgname='mqtt-explorer'
pkgver=0.3.5
-pkgrel=9
+pkgrel=10
pkgdesc="A comprehensive and easy-to-use MQTT Client"
arch=('any')
url="https://mqtt-explorer.com/"
license=('CCPL:by-nd')
depends=(
- 'npm'
- 'yarn'
+ 'nodejs'
)
makedepends=(
'git'
+ 'npm'
'sed'
+ 'yarn'
)
conflicts=('mqtt-explorer-beta') # currently, both programs cannot use the same config file
options=(!strip)
source=(
"$pkgname-${pkgver}.tar.gz::https://github.com/thomasnordquist/MQTT-Explorer/archive/v$pkgver.tar.gz"
- "$pkgname-${pkgver}-desktop.tar.gz::https://github.com/dave12311/mqtt-explorer.desktop/archive/1.1.tar.gz"
)
md5sums=(
'66b04e6991416cf8be67c0d8c3706477'
- '306a5ee73ab04fee5eb0f8202d2d90a1'
)
build() {
@@ -38,13 +37,9 @@ build() {
}
package() {
- mkdir -p "$pkgdir/usr/share/$pkgname"
- cp -r MQTT-Explorer-${pkgver}/* $pkgdir/usr/share/$pkgname/
- mkdir -p "$pkgdir/usr/share/applications"
- cp mqtt-explorer.desktop-1.1/mqtt-explorer.desktop $pkgdir/usr/share/applications/
- mkdir -p "$pkgdir/usr/bin"
- echo "#!/bin/bash" > "$pkgdir/usr/share/$pkgname/$pkgname"
- echo "yarn --cwd /usr/share/mqtt-explorer start" >> "$pkgdir/usr/share/$pkgname/$pkgname"
- chmod 777 "$pkgdir/usr/share/$pkgname/$pkgname"
- ln -s "/usr/share/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname"
+ mkdir -p "${pkgdir}/usr/share/$pkgname"
+ cp -rT "MQTT-Explorer-${pkgver}" "${pkgdir}/usr/share/$pkgname"
+
+ install -Dm 0644 "${srcdir}/../mqtt-explorer.desktop" "${pkgdir}/usr/share/applications/mqtt-explorer.desktop"
+ install -Dm 0755 "${srcdir}/../mqtt-explorer-run.sh" "${pkgdir}/usr/bin/mqtt-explorer"
}
diff --git a/mqtt-explorer-run.sh b/mqtt-explorer-run.sh
new file mode 100755
index 000000000000..4050d1edfb5c
--- /dev/null
+++ b/mqtt-explorer-run.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+/usr/share/mqtt-explorer/node_modules/.bin/electron /usr/share/mqtt-explorer
diff --git a/mqtt-explorer.desktop b/mqtt-explorer.desktop
new file mode 100644
index 000000000000..fb932334a191
--- /dev/null
+++ b/mqtt-explorer.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=MQTT Explorer
+GenericName=MQTT Explorer
+Comment=A comprehensive and easy-to-use MQTT Client.
+Exec=/usr/share/mqtt-explorer/node_modules/.bin/electron /usr/share/mqtt-explorer
+Icon=/usr/share/mqtt-explorer/icon.png
+StartupNotify=false
+Terminal=false
+Type=Application
+Categories=Utility;
+Keywords=MQTT;Explorer;