Change distribution to tar ball and other fixes

3 files changed, 27 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 37afc91cb2f0..7d1d47bd4eaa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,15 @@
 pkgbase = git-interactive-rebase-tool
 	pkgdesc = Native cross platform full feature terminal based sequence editor for git interactive rebase. Written in Rust using ncurses.
 	pkgver = 2.0.0
-	pkgrel = 1
-	url = https://github.com/MitMaro/git-interactive-rebase-tool
+	pkgrel = 2
+	url = https://gitrebasetool.mitmaro.ca/
 	install = git-interactive-rebase-tool.install
 	arch = x86_64
 	license = GPL3
-	makedepends = git
-	makedepends = rust
 	makedepends = cargo
-	depends = rust
-	source = git+https://github.com/MitMaro/git-interactive-rebase-tool.git
-	sha256sums = SKIP
+	depends = libgit2
+	source = git-interactive-rebase-tool-2.0.0.tar.gz::https://github.com/MitMaro/git-interactive-rebase-tool/archive/2.0.0.tar.gz
+	sha256sums = 572815b6bf152cae9414635caf9c8c918a575747c3a8885767380da4aeeeb709
 
 pkgname = git-interactive-rebase-tool
 
diff --git a/PKGBUILD b/PKGBUILD
index ab6cc7d979e6..ede4b52ee013 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,23 @@
 # Maintainer: Gabriel Guldner <gabriel at guldner dot eu>
 
+# Contributor: Martin Kröning <m.kroening@hotmail.de>
+
 pkgname=git-interactive-rebase-tool
+_binname=interactive-rebase-tool
 pkgver=2.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Native cross platform full feature terminal based sequence editor for git interactive rebase. Written in Rust using ncurses.'
 arch=('x86_64')
-url='https://github.com/MitMaro/git-interactive-rebase-tool'
+url='https://gitrebasetool.mitmaro.ca/'
 license=('GPL3')
-depends=('rust')
-makedepends=('git' 'rust' 'cargo')
+depends=('libgit2')
+makedepends=('cargo')
 install=$pkgname.install
-sha256sums=('SKIP')
-source=('git+https://github.com/MitMaro/git-interactive-rebase-tool.git')
-
-prepare() {
-  cd $pkgname
-  git checkout tags/$pkgver
-  git clean -dfx
-}
+source=("$pkgname-$pkgver.tar.gz::https://github.com/MitMaro/$pkgname/archive/$pkgver.tar.gz")
+sha256sums=('572815b6bf152cae9414635caf9c8c918a575747c3a8885767380da4aeeeb709')
 
 build() {
-  cd $pkgname
+  cd "$srcdir/$pkgname-$pkgver"
 
   if [ $(which rustup > /dev/null 2>&1; echo $?) -eq 0 ]; then
     if [ $(rustup default > /dev/null 2>&1; echo $?) -ne 0 ]; then
@@ -28,17 +25,19 @@ build() {
     fi
   fi
 
-  cargo build --release
+  cargo build --release --locked --target-dir=target
+}
+
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  cargo test --release --locked --target-dir=target
 }
 
 package() {
-  cd $pkgname
-  mkdir -p $pkgdir/usr/bin
-  mkdir -p $pkgdir/usr/share/man/man1
-  mkdir -p $pkgdir/usr/share/licenses/$pkgname
-  install -m755 target/release/interactive-rebase-tool $pkgdir/usr/bin/interactive-rebase-tool
-  install -m644 src/interactive-rebase-tool.1 $pkgdir/usr/share/man/man1/interactive-rebase-tool.1
-  install -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname
-  gzip $pkgdir/usr/share/man/man1/interactive-rebase-tool.1
+  cd "$srcdir/$pkgname-$pkgver"
+
+  install -Dm755 "target/release/$_binname" "$pkgdir/usr/bin/interactive-rebase-tool"
+  install -Dm644 "src/$_binname.1" "$pkgdir/usr/share/man/man1/interactive-rebase-tool.1"
 }
 
diff --git a/git-interactive-rebase-tool.install b/git-interactive-rebase-tool.install
index ae37701bf6f0..59e8edb671a1 100644
--- a/git-interactive-rebase-tool.install
+++ b/git-interactive-rebase-tool.install
@@ -7,7 +7,7 @@ post_install() {
 
 post_remove() {
   echo ""
-  echo "You have to remove the tool from the git configuration:"
+  echo "Remove interactive-rebase-tool from the git configuration:"
   echo "git config --global --unset sequence.editor"
   echo ""
 }