summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKr1ss2019-09-28 22:31:46 +0200
committerKr1ss2019-09-28 22:31:46 +0200
commit388b8ec430fa502a20e6b32f22e18cb80a3ea7d0 (patch)
treea067e78194820ae382a4ab6a42d40ca3411d68ff
parent3984d9f69f1596f09462f49473bae7b64cc132c4 (diff)
downloadaur-388b8ec430fa502a20e6b32f22e18cb80a3ea7d0.tar.gz
update: git-fiddle-git r67.606086d-3
This is a cleanup, to get rid of the patch file (plus gpg signature) in favor of a sed script, as well as some formatting improvements.
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD44
-rw-r--r--git-fiddle.patch11
-rw-r--r--git-fiddle.patch.sigbin566 -> 0 bytes
4 files changed, 24 insertions, 40 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 57a707c5605..98809fba796 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,13 @@
pkgbase = git-fiddle-git
pkgdesc = Edit commit messages, authors, and timestamps during git-rebase
pkgver = r67.606086d
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/felixSchl/git-fiddle
arch = any
license = MIT
depends = bash
depends = git
- source = git-fiddle::git+https://github.com/felixSchl/git-fiddle.git
- source = git-fiddle.patch
- source = git-fiddle.patch.sig
- validpgpkeys = 7A194E3F7A8F867BEA8A5339023F078862ACFE50
- sha256sums = SKIP
- sha256sums = 427f7d910811e10991e32da3b210925dc69886f8687d7464c21966955c03d056
+ source = git+https://github.com/felixSchl/git-fiddle.git
sha256sums = SKIP
pkgname = git-fiddle-git
diff --git a/PKGBUILD b/PKGBUILD
index 31849a3dbf2..c075dcc356f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,36 @@
-# Maintainer: Kr1ss <kr1ss.x@yandex.com>
-# Contributor: Chris Lahaye <dev@chrislahaye.com> (AUR package 'git-fiddle')
+# Maintainer : Kr1ss $(sed s/\+/./g\;s/\-/@/ <<<\<kr1ss+x-yandex+com\>)
+# Contributor : Chris Lahaye <dev@chrislahaye.com> (AUR package 'git-fiddle')
+
pkgname=git-fiddle-git
+
+pkgver() {
+ cd "${pkgname%-git}"
+ printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
pkgver=r67.606086d
-pkgrel=2
+pkgrel=3
+
pkgdesc='Edit commit messages, authors, and timestamps during git-rebase'
-url='https://github.com/felixSchl/git-fiddle'
arch=('any')
+url='https://github.com/felixSchl/git-fiddle'
license=('MIT')
+
depends=('bash' 'git')
-source=("${pkgname%-git}::git+https://github.com/felixSchl/git-fiddle.git"
- 'git-fiddle.patch'
- 'git-fiddle.patch.sig')
-sha256sums=('SKIP'
- '427f7d910811e10991e32da3b210925dc69886f8687d7464c21966955c03d056'
- 'SKIP')
-validpgpkeys=('7A194E3F7A8F867BEA8A5339023F078862ACFE50')
-pkgver() {
- cd "$srcdir/${pkgname%-git}"
- printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
+source=("git+https://github.com/felixSchl/${pkgname%-git}.git")
+sha256sums=('SKIP')
prepare() {
- cd "$srcdir"
- patch -p1 <git-fiddle.patch
+ sed -i 's|^\(SCRIPT_DIR=\).*|\1/usr/lib/git-fiddle|' "${pkgname%-git}/${pkgname%-git}"
}
package() {
- cd "$srcdir/${pkgname%-git}"
- install -Dm644 LICENSE "$pkgdir/usr/share/licenses/${pkgname%-git}/LICENSE"
- install -Dm644 "man1/${pkgname%-git}.1" "$pkgdir/usr/share/man/man1/${pkgname%-git}.1"
- install -Dm755 _fiddle_seq_editor "$pkgdir/usr/lib/${pkgname%-git}/_fiddle_seq_editor"
- install -Dm755 "${pkgname%-git}" "$pkgdir/usr/bin/${pkgname%-git}"
+ cd "${pkgname%-git}"
+ install -Dm755 _fiddle_seq_editor -t"$pkgdir/usr/lib/${pkgname%-git}/"
+ install -Dm755 "${pkgname%-git}" -t"$pkgdir/usr/bin/"
+ install -Dm644 "man1/${pkgname%-git}.1" -t"$pkgdir/usr/share/man/man1/"
+ install -Dm644 LICENSE -t"$pkgdir/usr/share/licenses/${pkgname%-git}/"
}
+
+# vim: ts=2 sw=2 et ft=PKGBUILD:
diff --git a/git-fiddle.patch b/git-fiddle.patch
deleted file mode 100644
index 862ea2ead01..00000000000
--- a/git-fiddle.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gf/git-fiddle/git-fiddle 2018-12-13 20:06:44.904371633 +0100
-+++ gf2/git-fiddle/git-fiddle 2018-12-13 20:45:32.131986428 +0100
-@@ -32,7 +32,7 @@
- # [git config: fiddle.body]
- # [args...] These arguments are passed verbatim to git-rebase
-
--SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-+SCRIPT_DIR='/usr/lib/git-fiddle'
- ORIGINAL_GIT_SEQUENCE_EDITOR="$GIT_SEQUENCE_EDITOR"
-
- # derive the help text from the first comment in a shell script
diff --git a/git-fiddle.patch.sig b/git-fiddle.patch.sig
deleted file mode 100644
index 1fe92a9b0ba..00000000000
--- a/git-fiddle.patch.sig
+++ /dev/null
Binary files differ