upgpkg: lucky-git r659.9618c44-1

3 files changed, 31 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ab368b7f27de..da4b8d8e641a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = lucky-git
-	pkgdesc = A web framework written in Crystal
-	pkgver = 0.22.0.r13.1fb6e57
+	pkgdesc = A Crystal command-line tool for generating new Lucky Web Applications
+	pkgver = r659.9618c44
 	pkgrel = 1
-	url = https://luckyframework.org/
+	url = https://github.com/luckyframework/lucky_cli
 	arch = x86_64
 	license = MIT
 	makedepends = git
@@ -10,8 +10,7 @@ pkgbase = lucky-git
 	depends = shards
 	provides = lucky
 	conflicts = lucky
-	source = git+https://github.com/luckyframework/lucky_cli.git
+	source = lucky-git::git+https://github.com/luckyframework/lucky_cli.git
 	sha256sums = SKIP
 
 pkgname = lucky-git
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..9bdeab1c4a51
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+/lucky-git/
+/src/
+/pkg/
+/*.tar.gz
+/*.pkg.tar.zst
diff --git a/PKGBUILD b/PKGBUILD
index ed0e32b0e1fb..b8a58e33f1fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,38 @@
-# Maintainer: David Cristofaro <david@dtcristo.com>
+# Maintainer: Fabien LEFEBVRE <contact@d1ceward.com>
+
 pkgname=lucky-git
-pkgver=0.22.0.r13.1fb6e57
+pkgver=r659.9618c44
 pkgrel=1
-pkgdesc='A web framework written in Crystal'
+pkgdesc='A Crystal command-line tool for generating new Lucky Web Applications'
 arch=('x86_64')
-url='https://luckyframework.org/'
+url='https://github.com/luckyframework/lucky_cli'
 license=('MIT')
-depends=('crystal' 'shards')
+depends=('crystal'
+         'shards')
 makedepends=('git')
+source=("${pkgname}::git+${url}.git")
+sha256sums=('SKIP')
 provides=('lucky')
 conflicts=('lucky')
-source=('git+https://github.com/luckyframework/lucky_cli.git')
-sha256sums=('SKIP')
 
 pkgver() {
-  cd "lucky_cli"
-  local tag=$(git rev-list --tags --max-count=1)
-  printf "%s.r%s.%s" "$(git describe --tags $tag | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g')" "$(git rev-list --count $tag..)" "$(git rev-parse --short HEAD)"
+  cd ${pkgname}
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-  cd "lucky_cli"
-  shards install
-  crystal build src/lucky.cr --release --no-debug
+  cd ${pkgname}
+
+  # Install dependencies
+  PATH="/usr/bin" shards install
+
+  # Build lucky cli
+  PATH="/usr/bin" shards build --progress --release --no-debug
 }
 
 package() {
-  cd "lucky_cli"
-  install -Dm755 lucky "$pkgdir/usr/bin/lucky"
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  cd ${pkgname}
+
+  install -Dm755 "bin/lucky" "${pkgdir}/usr/bin/lucky"
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }