[arch-commits] Commit in diff-so-fancy/repos/community-any (4 files)
Felix Yan
felixonmars at archlinux.org
Sat Jun 10 14:24:13 UTC 2017
Date: Saturday, June 10, 2017 @ 14:24:12
Author: felixonmars
Revision: 235917
archrelease: copy trunk to community-any
Added:
diff-so-fancy/repos/community-any/PKGBUILD
(from rev 235916, diff-so-fancy/trunk/PKGBUILD)
diff-so-fancy/repos/community-any/system-diff_highlight.patch
(from rev 235916, 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 | 95 +++++++++++++++++++-----------------------
system-diff_highlight.patch | 55 ++++++++++++++----------
2 files changed, 77 insertions(+), 73 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-06-10 14:23:55 UTC (rev 235916)
+++ PKGBUILD 2017-06-10 14:24:12 UTC (rev 235917)
@@ -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.4
-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 235916, diff-so-fancy/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-06-10 14:24:12 UTC (rev 235917)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: icasdri <icasdri at gmail dot com>
+
+pkgname=diff-so-fancy
+pkgver=1.0.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')
+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')
+
+prepare() {
+ cd "$srcdir"/$pkgname-$pkgver
+ patch -p0 -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-$pkgver
+ git init
+ bats test/*.bats
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
+
+ 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
+}
Deleted: system-diff_highlight.patch
===================================================================
--- system-diff_highlight.patch 2017-06-10 14:23:55 UTC (rev 235916)
+++ system-diff_highlight.patch 2017-06-10 14:24:12 UTC (rev 235917)
@@ -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 235916, diff-so-fancy/trunk/system-diff_highlight.patch)
===================================================================
--- system-diff_highlight.patch (rev 0)
+++ system-diff_highlight.patch 2017-06-10 14:24:12 UTC (rev 235917)
@@ -0,0 +1,33 @@
+--- 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";
+ }
More information about the arch-commits
mailing list