Update package() step, clean up PKGBUILD

Signed-off-by: Matthew McGinn <mamcgi@gmail.com>

2 files changed, 9 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f472c3bcf6da..834eb827f617 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Nov 25 23:47:57 UTC 2018
+# Mon Nov 26 23:12:20 UTC 2018
 pkgbase = etcher-cli-bin
 	pkgdesc = Burn images to SD cards & USB drives, safe & easy
 	pkgver = 1.4.8
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.etcher.io/
 	arch = x86_64
 	license = apache
diff --git a/PKGBUILD b/PKGBUILD
index c21e1d13d994..370a07d92022 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,8 @@
 # Maintainer: Matthew McGinn <mamcgi@gmail.com>
 # Contributor: Andrew Stubbs <andrew.stubbs@gmail.com>
 pkgname=etcher-cli-bin
-_realver=1.4.8
-pkgver=${_realver//-/_}
-pkgrel=1
+pkgver=1.4.8
+pkgrel=2
 pkgdesc="Burn images to SD cards & USB drives, safe & easy"
 arch=('x86_64')
 url="http://www.etcher.io/"
@@ -12,15 +11,13 @@ provides=('etcher-cli')
 conflicts=('etcher-cli' 'etcher-cli-git')
 depends=('gcc-libs')
 optdepends=()
-source=("https://github.com/balena-io/etcher/releases/download/v${_realver}/balena-etcher-cli-${_realver}-linux-x64.tar.gz")
+source=("https://github.com/balena-io/etcher/releases/download/v${pkgver}/balena-etcher-cli-${pkgver}-linux-x64.tar.gz")
 options=("!strip")
 sha256sums=('9befa06b68bb5846bcf5a9516785d48d6aaa9364d80a5802deb5b6a968bf5404')
 
 package() {
-    cd "$pkgdir"
-    mkdir opt
-    mv "$srcdir/balena-etcher-cli-${_realver}-linux-x64-dist" opt/etcher-cli
-
-    mkdir -p usr/bin
-    ln -s /opt/etcher-cli/etcher usr/bin/etcher
+    mkdir -p "${pkgdir}/opt"
+    mv "${srcdir}/balena-etcher-cli-${pkgver}-linux-x64-dist" "${pkgdir}/opt/etcher-cli"
+    mkdir -p "${pkgdir}/usr/bin"
+    ln -s "${pkgdir}/opt/etcher-cli/balena-etcher" "${pkgdir}/usr/bin/etcher"
 }