[arch-commits] Commit in diff-so-fancy/repos/community-any (4 files)
Felix Yan
felixonmars at archlinux.org
Tue Sep 20 14:12:14 UTC 2016
Date: Tuesday, September 20, 2016 @ 14:12:13
Author: felixonmars
Revision: 190052
archrelease: copy trunk to community-any
Added:
diff-so-fancy/repos/community-any/PKGBUILD
(from rev 190051, diff-so-fancy/trunk/PKGBUILD)
diff-so-fancy/repos/community-any/system-diff_highlight.patch
(from rev 190051, diff-so-fancy/trunk/system-diff_highlight.patch)
Deleted:
diff-so-fancy/repos/community-any/PKGBUILD
diff-so-fancy/repos/community-any/system-diff_highlight.patch
-----------------------------+
PKGBUILD | 102 +++++++++++++++++++++---------------------
system-diff_highlight.patch | 44 +++++++++---------
2 files changed, 73 insertions(+), 73 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2016-09-20 14:11:54 UTC (rev 190051)
+++ PKGBUILD 2016-09-20 14:12:13 UTC (rev 190052)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: icasdri <icasdri at gmail dot com>
-
-pkgname=diff-so-fancy
-pkgver=0.11.1
-pkgrel=1
-pkgdesc="Good-looking diffs with diff-highlight and more"
-arch=('any')
-url="https://github.com/so-fancy/diff-so-fancy"
-license=('MIT')
-depends=('git')
-checkdepends=('bash-bats')
-source=("git+https://github.com/so-fancy/diff-so-fancy.git#tag=v$pkgver"
- "git+https://github.com/ztombol/bats-support.git"
- "git+https://github.com/ztombol/bats-assert.git"
- system-diff_highlight.patch)
-sha384sums=('SKIP'
- 'SKIP'
- 'SKIP'
- '9ec860b54a91f4852d9426e7e471de918132c29e846772cc3d65b33ff5be78b95875ba994f96882e0ce9f5c6dccac998')
-
-prepare() {
- cd "$srcdir"/$pkgname
- git config submodule."test/test_helper/bats-support".url "$srcdir"/bats-support
- git config submodule."test/test_helper/bats-assert".url "$srcdir"/bats-assert
- git submodule update --init
-
- sed -i 's/libexec/lib/g' diff-so-fancy readme.md
- mv libexec lib
-
- patch -p1 -i ../system-diff_highlight.patch
- rm -r third_party
- rm test/diff-highlight.bats
-}
-
-check() {
- cd "$srcdir"/$pkgname
- bats test/*.bats
-}
-
-package() {
- cd "$srcdir"/$pkgname
-
- sed -i 's|$(get_script_dir)/lib/diff-so-fancy.pl|/usr/share/diff-so-fancy/diff-so-fancy.pl|' diff-so-fancy
-
- install -Dm755 'diff-so-fancy' "$pkgdir"/usr/bin/diff-so-fancy
- install -Dm755 'lib/diff-so-fancy.pl' "$pkgdir"/usr/share/diff-so-fancy/diff-so-fancy.pl
-
- install -Dm644 readme.md "$pkgdir"/usr/share/doc/diff-so-fancy/readme.md
-}
Copied: diff-so-fancy/repos/community-any/PKGBUILD (from rev 190051, diff-so-fancy/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2016-09-20 14:12:13 UTC (rev 190052)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: icasdri <icasdri at gmail dot com>
+
+pkgname=diff-so-fancy
+pkgver=0.11.2
+pkgrel=1
+pkgdesc="Good-looking diffs with diff-highlight and more"
+arch=('any')
+url="https://github.com/so-fancy/diff-so-fancy"
+license=('MIT')
+depends=('git')
+checkdepends=('bash-bats')
+source=("git+https://github.com/so-fancy/diff-so-fancy.git#tag=v$pkgver"
+ "git+https://github.com/ztombol/bats-support.git"
+ "git+https://github.com/ztombol/bats-assert.git"
+ system-diff_highlight.patch)
+sha384sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ '9ec860b54a91f4852d9426e7e471de918132c29e846772cc3d65b33ff5be78b95875ba994f96882e0ce9f5c6dccac998')
+
+prepare() {
+ cd "$srcdir"/$pkgname
+ git config submodule."test/test_helper/bats-support".url "$srcdir"/bats-support
+ git config submodule."test/test_helper/bats-assert".url "$srcdir"/bats-assert
+ git submodule update --init
+
+ sed -i 's/libexec/lib/g' diff-so-fancy readme.md
+ mv libexec lib
+
+ patch -p1 -i ../system-diff_highlight.patch
+ rm -r third_party
+ rm test/diff-highlight.bats
+}
+
+check() {
+ cd "$srcdir"/$pkgname
+ bats test/*.bats
+}
+
+package() {
+ cd "$srcdir"/$pkgname
+
+ sed -i 's|$(get_script_dir)/lib/diff-so-fancy.pl|/usr/share/diff-so-fancy/diff-so-fancy.pl|' diff-so-fancy
+
+ install -Dm755 'diff-so-fancy' "$pkgdir"/usr/bin/diff-so-fancy
+ install -Dm755 'lib/diff-so-fancy.pl' "$pkgdir"/usr/share/diff-so-fancy/diff-so-fancy.pl
+
+ install -Dm644 readme.md "$pkgdir"/usr/share/doc/diff-so-fancy/readme.md
+}
Deleted: system-diff_highlight.patch
===================================================================
--- system-diff_highlight.patch 2016-09-20 14:11:54 UTC (rev 190051)
+++ system-diff_highlight.patch 2016-09-20 14:12:13 UTC (rev 190052)
@@ -1,22 +0,0 @@
-From 10175a16b762282acd90ee624a73b55a362fbbca Mon Sep 17 00:00:00 2001
-From: Felix Yan <felixonmars at archlinux.org>
-Date: Sun, 14 Feb 2016 17:07:07 +0800
-Subject: [PATCH] Use system git's diff_highlight
-
----
- diff-so-fancy | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/diff-so-fancy b/diff-so-fancy
-index b17cf29..9f62e72 100755
---- a/diff-so-fancy
-+++ b/diff-so-fancy
-@@ -19,7 +19,7 @@ hash gsed 2> /dev/null && SED=gsed || SED=sed
- if hash diff-highlight 2> /dev/null; then
- diff_highlight=diff-highlight
- else
-- diff_highlight="$(get_script_dir)/third_party/diff-highlight/diff-highlight"
-+ diff_highlight="/usr/share/git/diff-highlight/diff-highlight"
- fi
-
- CSI=$'\x1b\['
Copied: diff-so-fancy/repos/community-any/system-diff_highlight.patch (from rev 190051, diff-so-fancy/trunk/system-diff_highlight.patch)
===================================================================
--- system-diff_highlight.patch (rev 0)
+++ system-diff_highlight.patch 2016-09-20 14:12:13 UTC (rev 190052)
@@ -0,0 +1,22 @@
+From 10175a16b762282acd90ee624a73b55a362fbbca Mon Sep 17 00:00:00 2001
+From: Felix Yan <felixonmars at archlinux.org>
+Date: Sun, 14 Feb 2016 17:07:07 +0800
+Subject: [PATCH] Use system git's diff_highlight
+
+---
+ diff-so-fancy | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/diff-so-fancy b/diff-so-fancy
+index b17cf29..9f62e72 100755
+--- a/diff-so-fancy
++++ b/diff-so-fancy
+@@ -19,7 +19,7 @@ hash gsed 2> /dev/null && SED=gsed || SED=sed
+ if hash diff-highlight 2> /dev/null; then
+ diff_highlight=diff-highlight
+ else
+- diff_highlight="$(get_script_dir)/third_party/diff-highlight/diff-highlight"
++ diff_highlight="/usr/share/git/diff-highlight/diff-highlight"
+ fi
+
+ CSI=$'\x1b\['
More information about the arch-commits
mailing list