Clean up PKGBUILD, fix depends/conflicts

- Don't `depends` on packages only needed for building (use
  `makedepends` for that)
- Add a `conflicts` for the -beta package. The beta's new config file is
  not backwards-compatible with the non-beta version.
- Remove empty variables
- Clean up indenting and variable ordering
- Add .gitignore

2 files changed, 35 insertions, 34 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..72e8ffc0db8a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*
diff --git a/PKGBUILD b/PKGBUILD
index 32b8ebd90e4f..98a24ff6dab5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,52 @@
-# Maintainer: David Horvath <horvath.david987 at gmail dot com>
+# Maintainer: Zach Himsel <zach at himsel dot net>
 pkgname='mqtt-explorer'
 pkgver=0.3.5
-pkgrel=7
+pkgrel=8
 pkgdesc="A comprehensive and easy-to-use MQTT Client"
 arch=('any')
 url="https://mqtt-explorer.com/"
 license=('CCPL:by-nd')
-groups=()
-depends=('npm'
-         'yarn'
-	     'git'
-		 'sed')
-makedepends=()
-checkdepends=()
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
+depends=(
+    'npm'
+    'yarn'
+    )
+makedepends=(
+    'git'
+    'sed'
+    )
+conflicts=('mqtt-explorer-beta') # currently, both programs cannot use the same config file
 backup=("~/.config/MQTT-Explorer/settings.json")
 options=(!strip)
-install=
-changelog=
-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")
 validpgpkeys=("4AEE18F83AFDEB23")
+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() {
-	cd "MQTT-Explorer-${pkgver}"
+  cd "MQTT-Explorer-${pkgver}"
 
-	sed -i 's/"heapdump": "^0.3.12",//' app/package.json
-	sed -i 's/if (!/\/*if (!/' app/src/components/Demo/index.tsx
-	sed -i 's/return path/\*\/return path/' app/src/components/Demo/index.tsx
+  sed -i 's/"heapdump": "^0.3.12",//' app/package.json
+  sed -i 's/if (!/\/*if (!/' app/src/components/Demo/index.tsx
+  sed -i 's/return path/\*\/return path/' app/src/components/Demo/index.tsx
 
   export NODE_OPTIONS=--openssl-legacy-provider
-	yarn || sed -i 's/node-gyp rebuild/node-gyp rebuild --openssl_fips=X/' app/package.json
-	yarn build
+  yarn || sed -i 's/node-gyp rebuild/node-gyp rebuild --openssl_fips=X/' app/package.json
+  yarn 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 -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"
 }
-md5sums=('66b04e6991416cf8be67c0d8c3706477'
-         '306a5ee73ab04fee5eb0f8202d2d90a1')