Date: Saturday, February 27, 2016 @ 02:59:37 Author: fyan Revision: 163542
archrelease: copy trunk to community-any Added: diff-so-fancy/repos/community-any/PKGBUILD (from rev 163541, diff-so-fancy/trunk/PKGBUILD) diff-so-fancy/repos/community-any/diff-so-fancy.install (from rev 163541, diff-so-fancy/trunk/diff-so-fancy.install) diff-so-fancy/repos/community-any/system-diff_highlight.patch (from rev 163541, 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 diff-so-fancy/repos/community-any/system-diff_highlight.patch -----------------------------+ PKGBUILD | 86 +++++++++++++++++++++--------------------- diff-so-fancy.install | 6 +- system-diff_highlight.patch | 44 ++++++++++----------- 3 files changed, 68 insertions(+), 68 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2016-02-27 01:59:19 UTC (rev 163541) +++ PKGBUILD 2016-02-27 01:59:37 UTC (rev 163542) @@ -1,43 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: icasdri <icasdri at gmail dot com> - -pkgname=diff-so-fancy -pkgver=0.5.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" - "git+https://github.com/ztombol/bats-core.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-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 - rm -r third_party - rm test/diff-highlight.bats -} - -check() { - cd "${srcdir}/${pkgname}" - bats test/*.bats -} - -package() { - cd "${srcdir}/${pkgname}" - install -Dm755 'diff-so-fancy' "${pkgdir}/usr/bin/diff-so-fancy" -} Copied: diff-so-fancy/repos/community-any/PKGBUILD (from rev 163541, diff-so-fancy/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2016-02-27 01:59:37 UTC (rev 163542) @@ -0,0 +1,43 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: icasdri <icasdri at gmail dot com> + +pkgname=diff-so-fancy +pkgver=0.5.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') +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' + '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 + git submodule update --init + + 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}" + install -Dm755 'diff-so-fancy' "${pkgdir}/usr/bin/diff-so-fancy" +} Deleted: diff-so-fancy.install =================================================================== --- diff-so-fancy.install 2016-02-27 01:59:19 UTC (rev 163541) +++ diff-so-fancy.install 2016-02-27 01:59:37 UTC (rev 163542) @@ -1,3 +0,0 @@ -post_install() { - echo "Refer to https://github.com/so-fancy/diff-so-fancy#usage for usage" -} Copied: diff-so-fancy/repos/community-any/diff-so-fancy.install (from rev 163541, diff-so-fancy/trunk/diff-so-fancy.install) =================================================================== --- diff-so-fancy.install (rev 0) +++ diff-so-fancy.install 2016-02-27 01:59:37 UTC (rev 163542) @@ -0,0 +1,3 @@ +post_install() { + echo "Refer to https://github.com/so-fancy/diff-so-fancy#usage for usage" +} Deleted: system-diff_highlight.patch =================================================================== --- system-diff_highlight.patch 2016-02-27 01:59:19 UTC (rev 163541) +++ system-diff_highlight.patch 2016-02-27 01:59:37 UTC (rev 163542) @@ -1,22 +0,0 @@ -From 10175a16b762282acd90ee624a73b55a362fbbca Mon Sep 17 00:00:00 2001 -From: Felix Yan <felixonm...@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 163541, diff-so-fancy/trunk/system-diff_highlight.patch) =================================================================== --- system-diff_highlight.patch (rev 0) +++ system-diff_highlight.patch 2016-02-27 01:59:37 UTC (rev 163542) @@ -0,0 +1,22 @@ +From 10175a16b762282acd90ee624a73b55a362fbbca Mon Sep 17 00:00:00 2001 +From: Felix Yan <felixonm...@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\['