[arch-commits] Commit in diff-so-fancy/repos/community-any (5 files)
Felix Yan
fyan at archlinux.org
Sun Feb 14 09:11:05 UTC 2016
Date: Sunday, February 14, 2016 @ 10:11:04
Author: fyan
Revision: 161531
archrelease: copy trunk to community-any
Added:
diff-so-fancy/repos/community-any/PKGBUILD
(from rev 161530, diff-so-fancy/trunk/PKGBUILD)
diff-so-fancy/repos/community-any/diff-so-fancy.install
(from rev 161530, diff-so-fancy/trunk/diff-so-fancy.install)
diff-so-fancy/repos/community-any/system-diff_highlight.patch
(from rev 161530, diff-so-fancy/trunk/system-diff_highlight.patch)
Deleted:
diff-so-fancy/repos/community-any/PKGBUILD
diff-so-fancy/repos/community-any/diff-so-fancy.install
-----------------------------+
PKGBUILD | 80 +++++++++++++++++++++---------------------
diff-so-fancy.install | 18 ++++-----
system-diff_highlight.patch | 22 +++++++++++
3 files changed, 72 insertions(+), 48 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2016-02-14 09:10:44 UTC (rev 161530)
+++ PKGBUILD 2016-02-14 09:11:04 UTC (rev 161531)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: icasdri <icasdri at gmail dot com>
-
-pkgname=diff-so-fancy
-pkgver=0.3.0
-pkgrel=1
-pkgdesc="Good-looking diffs with diff-highlight and more"
-arch=('any')
-url="https://github.com/stevemao/diff-so-fancy"
-license=('MIT')
-install="${pkgname}.install"
-depends=('bash' 'perl' 'sed')
-makedepends=('git')
-checkdepends=('bash-bats')
-source=("git+https://github.com/so-fancy/diff-so-fancy.git#tag=v$pkgver"
- "git+https://github.com/ztombol/bats-core.git"
- "git+https://github.com/ztombol/bats-assert.git")
-sha384sums=('SKIP'
- 'SKIP'
- 'SKIP')
-
-prepare() {
- cd "${srcdir}/${pkgname}"
- git config submodule."test/test_helper/bats-core".url "${srcdir}"/bats-core
- git config submodule."test/test_helper/bats-assert".url "${srcdir}"/bats-assert
- git submodule update --init
-}
-
-check() {
- cd "${srcdir}/${pkgname}"
- bats test/*.bats
-}
-
-package() {
- cd "${srcdir}/${pkgname}"
- install -Dm755 'diff-so-fancy' "${pkgdir}/usr/bin/diff-so-fancy"
- install -Dm755 'third_party/diff-highlight/diff-highlight' "${pkgdir}/usr/bin/diff-highlight"
-}
Copied: diff-so-fancy/repos/community-any/PKGBUILD (from rev 161530, diff-so-fancy/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2016-02-14 09:11:04 UTC (rev 161531)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: icasdri <icasdri at gmail dot com>
+
+pkgname=diff-so-fancy
+pkgver=0.3.0
+pkgrel=2
+pkgdesc="Good-looking diffs with diff-highlight and more"
+arch=('any')
+url="https://github.com/stevemao/diff-so-fancy"
+license=('MIT')
+install="${pkgname}.install"
+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-core.git"
+ "git+https://github.com/ztombol/bats-assert.git"
+ system-diff_highlight.patch)
+sha384sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ '586f722ae89c9d0d2ab1ce987052c7c0f4929efaad13c1c395cc15a72a47efe4214a958fdb973a17a6c761d9f7662d01')
+
+prepare() {
+ cd "${srcdir}/${pkgname}"
+ git config submodule."test/test_helper/bats-core".url "${srcdir}"/bats-core
+ git config submodule."test/test_helper/bats-assert".url "${srcdir}"/bats-assert
+ git submodule update --init
+
+ patch -p1 -i ../system-diff_highlight.patch
+}
+
+check() {
+ cd "${srcdir}/${pkgname}"
+ bats test/*.bats
+}
+
+package() {
+ cd "${srcdir}/${pkgname}"
+ install -Dm755 'diff-so-fancy' "${pkgdir}/usr/bin/diff-so-fancy"
+}
Deleted: diff-so-fancy.install
===================================================================
--- diff-so-fancy.install 2016-02-14 09:10:44 UTC (rev 161530)
+++ diff-so-fancy.install 2016-02-14 09:11:04 UTC (rev 161531)
@@ -1,9 +0,0 @@
-post_install() {
- echo
- echo "==> If you desire git-diff to use diff-so-fancy by default,"
- echo "==> set diff-so-fancy as your global pager with the following:"
- echo "==> git config --global core.pager 'diff-so-fancy | less --tabs=1,5 -R'"
- echo "==> Or for one-off usage, use:"
- echo "==> git diff --color | diff-so-fancy"
- echo
-}
Copied: diff-so-fancy/repos/community-any/diff-so-fancy.install (from rev 161530, diff-so-fancy/trunk/diff-so-fancy.install)
===================================================================
--- diff-so-fancy.install (rev 0)
+++ diff-so-fancy.install 2016-02-14 09:11:04 UTC (rev 161531)
@@ -0,0 +1,9 @@
+post_install() {
+ echo
+ echo "==> If you desire git-diff to use diff-so-fancy by default,"
+ echo "==> set diff-so-fancy as your global pager with the following:"
+ echo "==> git config --global core.pager 'diff-so-fancy | less --tabs=1,5 -R'"
+ echo "==> Or for one-off usage, use:"
+ echo "==> git diff --color | diff-so-fancy"
+ echo
+}
Copied: diff-so-fancy/repos/community-any/system-diff_highlight.patch (from rev 161530, diff-so-fancy/trunk/system-diff_highlight.patch)
===================================================================
--- system-diff_highlight.patch (rev 0)
+++ system-diff_highlight.patch 2016-02-14 09:11:04 UTC (rev 161531)
@@ -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
+
+ color_code_regex="(\x1B\[([0-9]{1,3}(;[0-9]{1,3}){0,3})[m|K])?"
More information about the arch-commits
mailing list