2 files changed, 17 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d0d86f16f93d..20ef14424bbb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = charm-tool
 	pkgdesc = The Charm Cloud Tool
-	pkgver = 0.8.4
+	pkgver = 0.9.2
 	pkgrel = 1
 	url = https://github.com/charmbracelet/charm
 	arch = x86_64
@@ -9,9 +9,10 @@ pkgbase = charm-tool
 	arch = armv7h
 	arch = aarch64
 	license = MIT
+	makedepends = git
 	makedepends = go
-	source = https://github.com/charmbracelet/charm/archive/v0.8.4/charm-0.8.4.tar.gz
-	sha256sums = 4d88f2b711fcaf19f86546ab2a793c221b95eb571c24b8650640af4759b3e4c7
+	depends = glibc
+	source = https://github.com/charmbracelet/charm/archive/v0.9.2/charm-0.9.2.tar.gz
+	sha256sums = 13c692389b312830e051d146701fcdea9da22f4df678bd93e6c5b22f48f18e59
 
 pkgname = charm-tool
-
diff --git a/PKGBUILD b/PKGBUILD
index 35b6d832b179..b19b5496dfdf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,24 @@
 # Maintainer: Christian Muehlhaeuser <muesli at gmail dot com>
 
 pkgname=charm-tool
-pkgver=0.8.4
+pkgver=0.9.2
 pkgrel=1
 pkgdesc="The Charm Cloud Tool"
 arch=('x86_64' 'i686' 'armv6h' 'armv7h' 'aarch64')
 url="https://github.com/charmbracelet/charm"
 license=('MIT')
-makedepends=('go')
+depends=('glibc')
+makedepends=('git' 'go')
 source=("${url}/archive/v${pkgver}/charm-${pkgver}.tar.gz")
-sha256sums=('4d88f2b711fcaf19f86546ab2a793c221b95eb571c24b8650640af4759b3e4c7')
+sha256sums=('13c692389b312830e051d146701fcdea9da22f4df678bd93e6c5b22f48f18e59')
 
 build() {
-    cd "charm-$pkgver"/cmd/charm
+    local commit
+    local extraflags
+    commit=$(zcat charm-${pkgver}.tar.gz | git get-tar-commit-id)
+    extraflags="-X main.Version=${pkgver} -X main.CommitSHA=${commit}"
+
+    cd "charm-$pkgver"
 
     export CGO_CPPFLAGS="${CPPFLAGS}"
     export CGO_CFLAGS="${CFLAGS}"
@@ -24,14 +30,14 @@ build() {
         -buildmode=pie \
         -mod=readonly \
         -modcacherw \
-        -ldflags "-X main.Version=$pkgver -linkmode external -extldflags \"${LDFLAGS}\"" \
+        -ldflags "${extraflags} -linkmode external -extldflags \"${LDFLAGS}\"" \
         -o "charm" .
 }
 
 package() {
     cd "charm-$pkgver"
 
-    install -Dm755 "cmd/charm/charm" "$pkgdir/usr/bin/charm"
+    install -Dm755 "charm" "$pkgdir/usr/bin/charm"
     install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }