[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD)
Date: Sunday, April 26, 2020 @ 21:57:12 Author: felixonmars Revision: 621685 upgpkg: diff-so-fancy 1.3.0-1 Modified: diff-so-fancy/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-04-26 21:56:29 UTC (rev 621684) +++ PKGBUILD2020-04-26 21:57:12 UTC (rev 621685) @@ -2,7 +2,7 @@ # Contributor: icasdri pkgname=diff-so-fancy -pkgver=1.2.7 +pkgver=1.3.0 pkgrel=1 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any') @@ -12,7 +12,7 @@ makedepends=('git') checkdepends=('bash-bats-assert' 'bash-bats-support') source=("$pkgname-$pkgver.tar.gz::https://github.com/so-fancy/diff-so-fancy/archive/v$pkgver.tar.gz;) -sha384sums=('63fa860baa62ea1455022433658feec080abcbbb528c116ef471ff697d6b29e21f7ae4e794e14eadff764fee12001230') +sha384sums=('3b8990c406674962bc47fb190966a75e73ef5e6e851b1daa6807e68dbfd7b522eeea37691fcc7ddc5f0e3d2f784369e5') prepare() { cd "$srcdir"/$pkgname-$pkgver
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD)
Date: Friday, August 30, 2019 @ 03:56:26 Author: felixonmars Revision: 505126 upgpkg: diff-so-fancy 1.2.7-1 Modified: diff-so-fancy/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-08-30 03:54:46 UTC (rev 505125) +++ PKGBUILD2019-08-30 03:56:26 UTC (rev 505126) @@ -2,7 +2,7 @@ # Contributor: icasdri pkgname=diff-so-fancy -pkgver=1.2.6 +pkgver=1.2.7 pkgrel=1 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any') @@ -12,7 +12,7 @@ makedepends=('git') checkdepends=('bash-bats-assert' 'bash-bats-support') source=("$pkgname-$pkgver.tar.gz::https://github.com/so-fancy/diff-so-fancy/archive/v$pkgver.tar.gz;) -sha384sums=('0d3a3111b43fc93c5583ed481e8b64f1030d9aabab613c8ebdfbe13878ef96702743cdc45ad530e3230833fdbdf999e2') +sha384sums=('63fa860baa62ea1455022433658feec080abcbbb528c116ef471ff697d6b29e21f7ae4e794e14eadff764fee12001230') prepare() { cd "$srcdir"/$pkgname-$pkgver
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD)
Date: Saturday, June 29, 2019 @ 13:18:06 Author: felixonmars Revision: 485740 upgpkg: diff-so-fancy 1.2.6-1 Modified: diff-so-fancy/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-06-29 13:18:00 UTC (rev 485739) +++ PKGBUILD2019-06-29 13:18:06 UTC (rev 485740) @@ -2,7 +2,7 @@ # Contributor: icasdri pkgname=diff-so-fancy -pkgver=1.2.5 +pkgver=1.2.6 pkgrel=1 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any') @@ -12,7 +12,7 @@ makedepends=('git') checkdepends=('bash-bats-assert' 'bash-bats-support') source=("$pkgname-$pkgver.tar.gz::https://github.com/so-fancy/diff-so-fancy/archive/v$pkgver.tar.gz;) -sha384sums=('72eed474b99aebb9492a43ec72e43dbd6c2b1aac81e625b35b01d37883b80414fe28591207504feea74277d118929466') +sha384sums=('0d3a3111b43fc93c5583ed481e8b64f1030d9aabab613c8ebdfbe13878ef96702743cdc45ad530e3230833fdbdf999e2') prepare() { cd "$srcdir"/$pkgname-$pkgver
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD)
Date: Friday, January 18, 2019 @ 12:26:02 Author: felixonmars Revision: 424077 upgpkg: diff-so-fancy 1.2.5-1 Modified: diff-so-fancy/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-01-18 12:24:00 UTC (rev 424076) +++ PKGBUILD2019-01-18 12:26:02 UTC (rev 424077) @@ -2,7 +2,7 @@ # Contributor: icasdri pkgname=diff-so-fancy -pkgver=1.2.0 +pkgver=1.2.5 pkgrel=1 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any') @@ -12,7 +12,7 @@ makedepends=('git') checkdepends=('bash-bats-assert' 'bash-bats-support') source=("$pkgname-$pkgver.tar.gz::https://github.com/so-fancy/diff-so-fancy/archive/v$pkgver.tar.gz;) -sha384sums=('77aa73a0fb1f76bbfe79348df11fb805ebcba6c0f7b34102dd4c071afa01a04e2e66533fb893fabdb88b5e5fc60de4d5') +sha384sums=('72eed474b99aebb9492a43ec72e43dbd6c2b1aac81e625b35b01d37883b80414fe28591207504feea74277d118929466') prepare() { cd "$srcdir"/$pkgname-$pkgver
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD system-diff_highlight.patch)
Date: Sunday, January 7, 2018 @ 07:09:53 Author: felixonmars Revision: 279787 upgpkg: diff-so-fancy 1.2.0-1 Modified: diff-so-fancy/trunk/PKGBUILD Deleted: diff-so-fancy/trunk/system-diff_highlight.patch -+ PKGBUILD| 20 ++-- system-diff_highlight.patch | 33 - 2 files changed, 10 insertions(+), 43 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-01-07 03:29:01 UTC (rev 279786) +++ PKGBUILD2018-01-07 07:09:53 UTC (rev 279787) @@ -3,30 +3,27 @@ # Contributor: icasdri pkgname=diff-so-fancy -pkgver=1.0.0 +pkgver=1.2.0 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') +depends=('perl') +makedepends=('git') checkdepends=('bash-bats-assert' 'bash-bats-support') -source=("$pkgname-$pkgver.tar.gz::https://github.com/so-fancy/diff-so-fancy/archive/v$pkgver.tar.gz; -system-diff_highlight.patch) -sha384sums=('00361ed7b36f2b4bb1d79430175e32daadfd5590ff5656e304d7e25c739f599f266efec1664cda7e4caf017a9a56316b' - 'ec4d6df1fc6dbf9e2c2f3fdc4d1c4e57e7cb2b085136f5f84cb32761e853cbc5a3a0878a62b467c05531286b19fe185e') +source=("$pkgname-$pkgver.tar.gz::https://github.com/so-fancy/diff-so-fancy/archive/v$pkgver.tar.gz;) +sha384sums=('77aa73a0fb1f76bbfe79348df11fb805ebcba6c0f7b34102dd4c071afa01a04e2e66533fb893fabdb88b5e5fc60de4d5') prepare() { cd "$srcdir"/$pkgname-$pkgver - patch -p0 -i ../system-diff_highlight.patch - rm -r third_party + rm -r third_party # lib sed -e 's|test_helper/bats-support|/usr/lib/bats-support|' \ -e 's|test_helper/bats-assert|/usr/lib/bats-assert|' \ -e "s|load'$|load.bash'|" \ -i test/*.bats - rm test/diff-highlight.bats } check() { @@ -38,7 +35,10 @@ package() { cd "$srcdir"/$pkgname-$pkgver + sed -i 's|^use lib .*$|use lib "/usr/share/diff-so-fancy";|' diff-so-fancy + install -Dm755 diff-so-fancy "$pkgdir"/usr/bin/diff-so-fancy - install -Dm644 readme.md "$pkgdir"/usr/share/doc/diff-so-fancy/readme.md + install -Dm755 lib/DiffHighlight.pm "$pkgdir"/usr/share/diff-so-fancy/DiffHighlight.pm + install -Dm644 README.md "$pkgdir"/usr/share/doc/diff-so-fancy/README.md install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } Deleted: system-diff_highlight.patch === --- system-diff_highlight.patch 2018-01-07 03:29:01 UTC (rev 279786) +++ system-diff_highlight.patch 2018-01-07 07:09:53 UTC (rev 279787) @@ -1,33 +0,0 @@ diff-so-fancy.old 2017-06-10 22:14:03.858070687 +0800 -+++ diff-so-fancy 2017-06-10 22:15:00.762691077 +0800 -@@ -572,29 +572,5 @@ - - # Find the location of diff-highlight - sub find_diff_highlight { --my $dh = "diff-highlight"; --my $dh_in_path = trim(`which $dh 2>/dev/null`); --my $ret; -- --# We check for diff-highlight in three places: --# 1) System path --# 2) Same dir as d-s-f --# 3) third_party/diff-highlight/ -- --# This is #1 --if ($dh_in_path) { --$ret = $dh_in_path; --# This is #2 and #3 --} else { --$ret = dirname(Cwd::realpath($0)) . "/diff-highlight"; --if (!-X $ret) { --$ret = dirname(Cwd::realpath($0)) . "/third_party/$dh/diff-highlight"; --} --} -- --if (!-X $ret) { --die("Error locating diff-highlight\n"); --} -- --return $ret; -+return "/usr/share/git/diff-highlight/diff-highlight"; - }
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD system-diff_highlight.patch)
Date: Saturday, June 10, 2017 @ 14:23:55 Author: felixonmars Revision: 235916 upgpkg: diff-so-fancy 1.0.0-1 Modified: diff-so-fancy/trunk/PKGBUILD diff-so-fancy/trunk/system-diff_highlight.patch -+ PKGBUILD| 41 +--- system-diff_highlight.patch | 53 +- 2 files changed, 49 insertions(+), 45 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-06-10 14:12:41 UTC (rev 235915) +++ PKGBUILD2017-06-10 14:23:55 UTC (rev 235916) @@ -3,7 +3,7 @@ # Contributor: icasdri pkgname=diff-so-fancy -pkgver=0.11.4 +pkgver=1.0.0 pkgrel=1 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any') @@ -10,42 +10,35 @@ 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; +checkdepends=('bash-bats-assert' 'bash-bats-support') +source=("$pkgname-$pkgver.tar.gz::https://github.com/so-fancy/diff-so-fancy/archive/v$pkgver.tar.gz; system-diff_highlight.patch) -sha384sums=('SKIP' -'SKIP' -'SKIP' - '9ec860b54a91f4852d9426e7e471de918132c29e846772cc3d65b33ff5be78b95875ba994f96882e0ce9f5c6dccac998') +sha384sums=('00361ed7b36f2b4bb1d79430175e32daadfd5590ff5656e304d7e25c739f599f266efec1664cda7e4caf017a9a56316b' + 'ec4d6df1fc6dbf9e2c2f3fdc4d1c4e57e7cb2b085136f5f84cb32761e853cbc5a3a0878a62b467c05531286b19fe185e') 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 + cd "$srcdir"/$pkgname-$pkgver + patch -p0 -i ../system-diff_highlight.patch - sed -i 's/libexec/lib/g' diff-so-fancy readme.md - mv libexec lib + rm -r third_party - patch -p1 -i ../system-diff_highlight.patch - rm -r third_party + sed -e 's|test_helper/bats-support|/usr/lib/bats-support|' \ + -e 's|test_helper/bats-assert|/usr/lib/bats-assert|' \ + -e "s|load'$|load.bash'|" \ + -i test/*.bats rm test/diff-highlight.bats } check() { - cd "$srcdir"/$pkgname + cd "$srcdir"/$pkgname-$pkgver + git init bats test/*.bats } package() { - cd "$srcdir"/$pkgname + cd "$srcdir"/$pkgname-$pkgver - 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 -Dm755 diff-so-fancy "$pkgdir"/usr/bin/diff-so-fancy install -Dm644 readme.md "$pkgdir"/usr/share/doc/diff-so-fancy/readme.md + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } Modified: system-diff_highlight.patch === --- system-diff_highlight.patch 2017-06-10 14:12:41 UTC (rev 235915) +++ system-diff_highlight.patch 2017-06-10 14:23:55 UTC (rev 235916) @@ -1,22 +1,33 @@ -From 10175a16b762282acd90ee624a73b55a362fbbca Mon Sep 17 00:00:00 2001 -From: Felix Yan-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 +--- diff-so-fancy.old 2017-06-10 22:14:03.858070687 +0800 diff-so-fancy 2017-06-10 22:15:00.762691077 +0800 +@@ -572,29 +572,5 @@ - CSI=$'\x1b\[' + # Find the location of diff-highlight + sub find_diff_highlight { +-my $dh = "diff-highlight"; +-my $dh_in_path = trim(`which $dh 2>/dev/null`); +-my $ret; +- +-# We check for diff-highlight in three places: +-# 1) System path +-# 2) Same dir as d-s-f +-# 3) third_party/diff-highlight/ +- +-# This is #1 +-if ($dh_in_path) { +-$ret = $dh_in_path; +-# This is #2 and #3 +-} else { +-$ret = dirname(Cwd::realpath($0)) . "/diff-highlight"; +-if (!-X $ret) { +-$ret = dirname(Cwd::realpath($0)) . "/third_party/$dh/diff-highlight"; +-} +-} +- +-if (!-X $ret) { +-die("Error locating diff-highlight\n"); +-} +- +-return $ret; ++return
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD)
Date: Saturday, March 4, 2017 @ 08:00:15 Author: felixonmars Revision: 214835 upgpkg: diff-so-fancy 0.11.4-1 Modified: diff-so-fancy/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-03-04 06:52:47 UTC (rev 214834) +++ PKGBUILD2017-03-04 08:00:15 UTC (rev 214835) @@ -3,7 +3,7 @@ # Contributor: icasdri pkgname=diff-so-fancy -pkgver=0.11.3 +pkgver=0.11.4 pkgrel=1 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any')
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD)
Date: Monday, February 27, 2017 @ 05:09:49 Author: felixonmars Revision: 213927 upgpkg: diff-so-fancy 0.11.3-1 Modified: diff-so-fancy/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-02-27 05:06:55 UTC (rev 213926) +++ PKGBUILD2017-02-27 05:09:49 UTC (rev 213927) @@ -3,7 +3,7 @@ # Contributor: icasdri pkgname=diff-so-fancy -pkgver=0.11.2 +pkgver=0.11.3 pkgrel=1 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any')
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD)
Date: Tuesday, September 20, 2016 @ 14:11:54 Author: felixonmars Revision: 190051 upgpkg: diff-so-fancy 0.11.2-1 Modified: diff-so-fancy/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-09-20 12:06:47 UTC (rev 190050) +++ PKGBUILD2016-09-20 14:11:54 UTC (rev 190051) @@ -3,7 +3,7 @@ # Contributor: icasdri pkgname=diff-so-fancy -pkgver=0.11.1 +pkgver=0.11.2 pkgrel=1 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any')
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD)
Date: Friday, August 12, 2016 @ 06:09:46 Author: felixonmars Revision: 186472 upgpkg: diff-so-fancy 0.11.1-1 Modified: diff-so-fancy/trunk/PKGBUILD --+ PKGBUILD |5 - 1 file changed, 4 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-08-12 06:01:05 UTC (rev 186471) +++ PKGBUILD2016-08-12 06:09:46 UTC (rev 186472) @@ -3,7 +3,7 @@ # Contributor: icasdri pkgname=diff-so-fancy -pkgver=0.11.0 +pkgver=0.11.1 pkgrel=1 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any') @@ -26,6 +26,9 @@ 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
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD diff-so-fancy.install)
Date: Wednesday, August 10, 2016 @ 03:27:54 Author: felixonmars Revision: 186274 upgpkg: diff-so-fancy 0.11.0-1 Modified: diff-so-fancy/trunk/PKGBUILD Deleted: diff-so-fancy/trunk/diff-so-fancy.install ---+ PKGBUILD |5 +++-- diff-so-fancy.install |3 --- 2 files changed, 3 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-08-10 03:25:03 UTC (rev 186273) +++ PKGBUILD2016-08-10 03:27:54 UTC (rev 186274) @@ -3,13 +3,12 @@ # Contributor: icasdri pkgname=diff-so-fancy -pkgver=0.10.1 +pkgver=0.11.0 pkgrel=1 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any') url="https://github.com/so-fancy/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; @@ -44,4 +43,6 @@ 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: diff-so-fancy.install === --- diff-so-fancy.install 2016-08-10 03:25:03 UTC (rev 186273) +++ diff-so-fancy.install 2016-08-10 03:27:54 UTC (rev 186274) @@ -1,3 +0,0 @@ -post_install() { -echo "Refer to https://github.com/so-fancy/diff-so-fancy#usage for usage" -}
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD)
Date: Sunday, July 17, 2016 @ 02:53:49 Author: felixonmars Revision: 183009 upgpkg: diff-so-fancy 0.10.1-1 Modified: diff-so-fancy/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-07-17 02:23:23 UTC (rev 183008) +++ PKGBUILD2016-07-17 02:53:49 UTC (rev 183009) @@ -3,7 +3,7 @@ # Contributor: icasdri pkgname=diff-so-fancy -pkgver=0.10.0 +pkgver=0.10.1 pkgrel=1 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any')
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD)
Date: Wednesday, June 22, 2016 @ 06:23:27 Author: felixonmars Revision: 180724 upgpkg: diff-so-fancy 0.10.0-1 Modified: diff-so-fancy/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-06-22 03:38:58 UTC (rev 180723) +++ PKGBUILD2016-06-22 06:23:27 UTC (rev 180724) @@ -3,7 +3,7 @@ # Contributor: icasdri pkgname=diff-so-fancy -pkgver=0.9.3 +pkgver=0.10.0 pkgrel=1 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any')
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD)
Date: Wednesday, May 25, 2016 @ 18:42:06 Author: fyan Revision: 177034 upgpkg: diff-so-fancy 0.9.3-1 Modified: diff-so-fancy/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-05-25 16:24:30 UTC (rev 177033) +++ PKGBUILD2016-05-25 16:42:06 UTC (rev 177034) @@ -3,7 +3,7 @@ # Contributor: icasdri pkgname=diff-so-fancy -pkgver=0.9.2 +pkgver=0.9.3 pkgrel=1 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any')
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD)
Date: Wednesday, May 25, 2016 @ 06:14:00 Author: fyan Revision: 176490 upgpkg: diff-so-fancy 0.9.2-1 Modified: diff-so-fancy/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-05-25 04:09:58 UTC (rev 176489) +++ PKGBUILD2016-05-25 04:14:00 UTC (rev 176490) @@ -3,7 +3,7 @@ # Contributor: icasdri pkgname=diff-so-fancy -pkgver=0.9.1 +pkgver=0.9.2 pkgrel=1 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any')
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD)
Date: Friday, May 13, 2016 @ 12:15:19 Author: fyan Revision: 175205 upgpkg: diff-so-fancy 0.9.1-1 Modified: diff-so-fancy/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-05-13 10:08:25 UTC (rev 175204) +++ PKGBUILD2016-05-13 10:15:19 UTC (rev 175205) @@ -3,7 +3,7 @@ # Contributor: icasdri pkgname=diff-so-fancy -pkgver=0.9.0 +pkgver=0.9.1 pkgrel=1 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any')
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD)
Date: Friday, May 13, 2016 @ 05:03:28 Author: fyan Revision: 175092 upgpkg: diff-so-fancy 0.9.0-1 Modified: diff-so-fancy/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-05-12 21:36:58 UTC (rev 175091) +++ PKGBUILD2016-05-13 03:03:28 UTC (rev 175092) @@ -3,7 +3,7 @@ # Contributor: icasdri pkgname=diff-so-fancy -pkgver=0.8.0 +pkgver=0.9.0 pkgrel=1 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any')
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD)
Date: Monday, April 18, 2016 @ 09:22:43 Author: fyan Revision: 171320 upgpkg: diff-so-fancy 0.8.0-1 Modified: diff-so-fancy/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-04-18 07:20:17 UTC (rev 171319) +++ PKGBUILD2016-04-18 07:22:43 UTC (rev 171320) @@ -3,7 +3,7 @@ # Contributor: icasdri pkgname=diff-so-fancy -pkgver=0.7.1 +pkgver=0.8.0 pkgrel=1 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any')
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD)
Date: Saturday, April 2, 2016 @ 05:27:56 Author: fyan Revision: 169195 upgpkg: diff-so-fancy 0.7.1-1 Modified: diff-so-fancy/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-04-01 23:30:35 UTC (rev 169194) +++ PKGBUILD2016-04-02 03:27:56 UTC (rev 169195) @@ -3,7 +3,7 @@ # Contributor: icasdri pkgname=diff-so-fancy -pkgver=0.7.0 +pkgver=0.7.1 pkgrel=1 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any')
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD)
Date: Tuesday, March 22, 2016 @ 15:03:01 Author: fyan Revision: 167907 upgpkg: diff-so-fancy 0.7.0-1 Modified: diff-so-fancy/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-03-22 13:35:14 UTC (rev 167906) +++ PKGBUILD2016-03-22 14:03:01 UTC (rev 167907) @@ -3,7 +3,7 @@ # Contributor: icasdri pkgname=diff-so-fancy -pkgver=0.6.3 +pkgver=0.7.0 pkgrel=1 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any') @@ -40,8 +40,8 @@ package() { cd "$srcdir"/$pkgname - sed -i 's|$(get_script_dir)/libs/header_clean/header_clean.pl|/usr/share/diff-so-fancy/header_clean/header_clean.pl|' diff-so-fancy + 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 'libs/header_clean/header_clean.pl' "$pkgdir"/usr/share/diff-so-fancy/header_clean/header_clean.pl + install -Dm755 'lib/diff-so-fancy.pl' "$pkgdir"/usr/share/diff-so-fancy/diff-so-fancy.pl }
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD)
Date: Thursday, March 10, 2016 @ 12:54:44 Author: fyan Revision: 165916 upgpkg: diff-so-fancy 0.6.3-1 Modified: diff-so-fancy/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-03-10 10:45:54 UTC (rev 165915) +++ PKGBUILD2016-03-10 11:54:44 UTC (rev 165916) @@ -3,7 +3,7 @@ # Contributor: icasdri pkgname=diff-so-fancy -pkgver=0.6.2 +pkgver=0.6.3 pkgrel=1 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any')
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD)
Date: Wednesday, March 9, 2016 @ 12:36:48 Author: fyan Revision: 165721 upgpkg: diff-so-fancy 0.6.2-1 Modified: diff-so-fancy/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-03-09 11:26:58 UTC (rev 165720) +++ PKGBUILD2016-03-09 11:36:48 UTC (rev 165721) @@ -3,7 +3,7 @@ # Contributor: icasdri pkgname=diff-so-fancy -pkgver=0.6.0 +pkgver=0.6.2 pkgrel=1 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any')
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD)
Date: Sunday, March 6, 2016 @ 05:42:15 Author: fyan Revision: 165191 upgpkg: diff-so-fancy 0.6.0-1 Modified: diff-so-fancy/trunk/PKGBUILD --+ PKGBUILD | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-03-06 04:39:32 UTC (rev 165190) +++ PKGBUILD2016-03-06 04:42:15 UTC (rev 165191) @@ -3,17 +3,17 @@ # Contributor: icasdri pkgname=diff-so-fancy -pkgver=0.5.2 -pkgrel=2 +pkgver=0.6.0 +pkgrel=1 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any') url="https://github.com/so-fancy/diff-so-fancy; license=('MIT') -install="${pkgname}.install" +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-support.git; "git+https://github.com/ztombol/bats-assert.git; system-diff_highlight.patch) sha384sums=('SKIP' @@ -22,9 +22,9 @@ '9ec860b54a91f4852d9426e7e471de918132c29e846772cc3d65b33ff5be78b95875ba994f96882e0ce9f5c6dccac998') 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 + 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 patch -p1 -i ../system-diff_highlight.patch @@ -33,12 +33,12 @@ } check() { - cd "${srcdir}/${pkgname}" + cd "$srcdir"/$pkgname bats test/*.bats } package() { - cd "${srcdir}/${pkgname}" + cd "$srcdir"/$pkgname sed -i 's|$(get_script_dir)/libs/header_clean/header_clean.pl|/usr/share/diff-so-fancy/header_clean/header_clean.pl|' diff-so-fancy
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD)
Date: Wednesday, March 2, 2016 @ 05:05:42 Author: fyan Revision: 164030 upgpkg: diff-so-fancy 0.5.2-2 include header_clean.pl Modified: diff-so-fancy/trunk/PKGBUILD --+ PKGBUILD |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-03-02 03:54:23 UTC (rev 164029) +++ PKGBUILD2016-03-02 04:05:42 UTC (rev 164030) @@ -4,7 +4,7 @@ pkgname=diff-so-fancy pkgver=0.5.2 -pkgrel=1 +pkgrel=2 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any') url="https://github.com/so-fancy/diff-so-fancy; @@ -39,5 +39,9 @@ package() { cd "${srcdir}/${pkgname}" - install -Dm755 'diff-so-fancy' "${pkgdir}/usr/bin/diff-so-fancy" + + sed -i 's|$(get_script_dir)/libs/header_clean/header_clean.pl|/usr/share/diff-so-fancy/header_clean/header_clean.pl|' diff-so-fancy + + install -Dm755 'diff-so-fancy' "$pkgdir"/usr/bin/diff-so-fancy + install -Dm755 'libs/header_clean/header_clean.pl' "$pkgdir"/usr/share/diff-so-fancy/header_clean/header_clean.pl }
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD)
Date: Wednesday, March 2, 2016 @ 03:42:23 Author: fyan Revision: 164018 upgpkg: diff-so-fancy 0.5.2-1 Modified: diff-so-fancy/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-03-02 02:42:17 UTC (rev 164017) +++ PKGBUILD2016-03-02 02:42:23 UTC (rev 164018) @@ -3,7 +3,7 @@ # Contributor: icasdri pkgname=diff-so-fancy -pkgver=0.5.1 +pkgver=0.5.2 pkgrel=1 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any')
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD)
Date: Saturday, February 27, 2016 @ 02:59:19 Author: fyan Revision: 163541 upgpkg: diff-so-fancy 0.5.1-1 Modified: diff-so-fancy/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-02-27 01:51:44 UTC (rev 163540) +++ PKGBUILD2016-02-27 01:59:19 UTC (rev 163541) @@ -3,7 +3,7 @@ # Contributor: icasdri pkgname=diff-so-fancy -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any')
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD)
Date: Thursday, February 25, 2016 @ 16:39:46 Author: fyan Revision: 163420 upgpkg: diff-so-fancy 0.5.0-1 Modified: diff-so-fancy/trunk/PKGBUILD --+ PKGBUILD |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-02-25 15:17:35 UTC (rev 163419) +++ PKGBUILD2016-02-25 15:39:46 UTC (rev 163420) @@ -3,7 +3,7 @@ # Contributor: icasdri pkgname=diff-so-fancy -pkgver=0.4.1 +pkgver=0.5.0 pkgrel=1 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any') @@ -28,6 +28,8 @@ git submodule update --init patch -p1 -i ../system-diff_highlight.patch + rm -r third_party + rm test/diff-highlight.bats } check() {
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD)
Date: Wednesday, February 17, 2016 @ 11:26:05 Author: fyan Revision: 161998 upgpkg: diff-so-fancy 0.4.1-1 Modified: diff-so-fancy/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-02-17 10:23:46 UTC (rev 161997) +++ PKGBUILD2016-02-17 10:26:05 UTC (rev 161998) @@ -3,7 +3,7 @@ # Contributor: icasdri pkgname=diff-so-fancy -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=1 pkgdesc="Good-looking diffs with diff-highlight and more" arch=('any')
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD)
Date: Sunday, February 14, 2016 @ 09:52:24 Author: fyan Revision: 161528 upgpkg: diff-so-fancy 0.3.0-1 Modified: diff-so-fancy/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-02-14 08:49:25 UTC (rev 161527) +++ PKGBUILD2016-02-14 08:52:24 UTC (rev 161528) @@ -10,7 +10,7 @@ url="https://github.com/stevemao/diff-so-fancy; license=('MIT') install="${pkgname}.install" -depends=('bash') +depends=('bash' 'perl' 'sed') makedepends=('git') checkdepends=('bash-bats') source=("git+https://github.com/so-fancy/diff-so-fancy.git#tag=v$pkgver;
[arch-commits] Commit in diff-so-fancy/trunk (PKGBUILD system-diff_highlight.patch)
Date: Sunday, February 14, 2016 @ 10:10:44 Author: fyan Revision: 161530 upgpkg: diff-so-fancy 0.3.0-2 use system git's diff_highlight Added: diff-so-fancy/trunk/system-diff_highlight.patch Modified: diff-so-fancy/trunk/PKGBUILD -+ PKGBUILD| 14 -- system-diff_highlight.patch | 22 ++ 2 files changed, 30 insertions(+), 6 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-02-14 08:52:39 UTC (rev 161529) +++ PKGBUILD2016-02-14 09:10:44 UTC (rev 161530) @@ -4,21 +4,22 @@ pkgname=diff-so-fancy pkgver=0.3.0 -pkgrel=1 +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=('bash' 'perl' 'sed') -makedepends=('git') +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;) +"git+https://github.com/ztombol/bats-assert.git; +system-diff_highlight.patch) sha384sums=('SKIP' 'SKIP' -'SKIP') +'SKIP' + '586f722ae89c9d0d2ab1ce987052c7c0f4929efaad13c1c395cc15a72a47efe4214a958fdb973a17a6c761d9f7662d01') prepare() { cd "${srcdir}/${pkgname}" @@ -25,6 +26,8 @@ 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() { @@ -35,5 +38,4 @@ 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" } Added: system-diff_highlight.patch === --- system-diff_highlight.patch (rev 0) +++ system-diff_highlight.patch 2016-02-14 09:10:44 UTC (rev 161530) @@ -0,0 +1,22 @@ +From 10175a16b762282acd90ee624a73b55a362fbbca Mon Sep 17 00:00:00 2001 +From: Felix Yan+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])?"