[arch-commits] Commit in fish/repos (10 files)
Bartłomiej Piotrowski
bpiotrowski at archlinux.org
Wed Nov 26 17:53:43 UTC 2014
Date: Wednesday, November 26, 2014 @ 18:53:43
Author: bpiotrowski
Revision: 123159
archrelease: copy trunk to community-i686, community-x86_64
Added:
fish/repos/community-i686/PKGBUILD
(from rev 123158, fish/trunk/PKGBUILD)
fish/repos/community-i686/fish-2.1.1-grep-options-is-deprecated.patch
(from rev 123158, fish/trunk/fish-2.1.1-grep-options-is-deprecated.patch)
fish/repos/community-i686/fish.install
(from rev 123158, fish/trunk/fish.install)
fish/repos/community-x86_64/PKGBUILD
(from rev 123158, fish/trunk/PKGBUILD)
fish/repos/community-x86_64/fish-2.1.1-grep-options-is-deprecated.patch
(from rev 123158, fish/trunk/fish-2.1.1-grep-options-is-deprecated.patch)
fish/repos/community-x86_64/fish.install
(from rev 123158, fish/trunk/fish.install)
Deleted:
fish/repos/community-i686/PKGBUILD
fish/repos/community-i686/fish.install
fish/repos/community-x86_64/PKGBUILD
fish/repos/community-x86_64/fish.install
--------------------------------------------------------------+
/PKGBUILD | 82 ++++++++++
/fish.install | 34 ++++
community-i686/PKGBUILD | 37 ----
community-i686/fish-2.1.1-grep-options-is-deprecated.patch | 15 +
community-i686/fish.install | 17 --
community-x86_64/PKGBUILD | 37 ----
community-x86_64/fish-2.1.1-grep-options-is-deprecated.patch | 15 +
community-x86_64/fish.install | 17 --
8 files changed, 146 insertions(+), 108 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-11-26 17:53:28 UTC (rev 123158)
+++ community-i686/PKGBUILD 2014-11-26 17:53:43 UTC (rev 123159)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Kaiting Chen <kaitocracy at gmail.com>
-# Contributor: Abhishek Dasgupta <abhidg at gmail.com>
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: Jan Fader <jan.fader at web.de>
-
-pkgname=fish
-pkgver=2.1.1
-pkgrel=4
-pkgdesc='Smart and user friendly shell intended mostly for interactive use'
-arch=('i686' 'x86_64')
-url='http://fishshell.com/'
-license=('GPL2')
-depends=('bc' 'gcc-libs' 'inetutils' 'ncurses' 'which')
-optdepends=('python: for manual page completion parser and web configuration tool')
-makedepends=('doxygen')
-install=fish.install
-source=(https://github.com/fish-shell/fish-shell/archive/$pkgver.tar.gz)
-md5sums=('9c6e98985636b5268eae2da0ff79311d')
-
-prepare() {
- cd fish-shell-$pkgver
- echo $pkgver > version
- autoconf -i
-}
-
-build() {
- cd fish-shell-$pkgver
- ./configure --prefix=/usr \
- --sysconfdir=/etc
- make
-}
-
-package() {
- make -C fish-shell-$pkgver DESTDIR="$pkgdir" install
-}
Copied: fish/repos/community-i686/PKGBUILD (from rev 123158, fish/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-11-26 17:53:43 UTC (rev 123159)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Kaiting Chen <kaitocracy at gmail.com>
+# Contributor: Abhishek Dasgupta <abhidg at gmail.com>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: Jan Fader <jan.fader at web.de>
+
+pkgname=fish
+pkgver=2.1.1
+pkgrel=5
+pkgdesc='Smart and user friendly shell intended mostly for interactive use'
+arch=('i686' 'x86_64')
+url='http://fishshell.com/'
+license=('GPL2')
+depends=('bc' 'gcc-libs' 'inetutils' 'ncurses' 'which')
+optdepends=('python: for manual page completion parser and web configuration tool')
+makedepends=('doxygen')
+install=fish.install
+source=(https://github.com/fish-shell/fish-shell/archive/$pkgver.tar.gz
+ fish-2.1.1-grep-options-is-deprecated.patch)
+md5sums=('9c6e98985636b5268eae2da0ff79311d'
+ '0c94b1ca8c54ed1a03b551f9b84160e5')
+
+prepare() {
+ cd fish-shell-$pkgver
+ patch -p1 -i ../fish-2.1.1-grep-options-is-deprecated.patch
+
+ echo $pkgver > version
+ autoconf -i
+}
+
+build() {
+ cd fish-shell-$pkgver
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc
+ make
+}
+
+package() {
+ make -C fish-shell-$pkgver DESTDIR="$pkgdir" install
+}
Copied: fish/repos/community-i686/fish-2.1.1-grep-options-is-deprecated.patch (from rev 123158, fish/trunk/fish-2.1.1-grep-options-is-deprecated.patch)
===================================================================
--- community-i686/fish-2.1.1-grep-options-is-deprecated.patch (rev 0)
+++ community-i686/fish-2.1.1-grep-options-is-deprecated.patch 2014-11-26 17:53:43 UTC (rev 123159)
@@ -0,0 +1,15 @@
+diff --git a/share/functions/grep.fish b/share/functions/grep.fish
+index b0dc958..cd7c31b 100644
+--- a/share/functions/grep.fish
++++ b/share/functions/grep.fish
+@@ -6,8 +6,8 @@ if command grep --color=auto --help 1>/dev/null 2>/dev/null
+ if not set -q GREP_COLOR
+ set -gx GREP_COLOR '97;45'
+ end
+- if not set -q GREP_OPTIONS
+- set -gx GREP_OPTIONS --color=auto
++ function grep
++ command grep --color=auto $argv
+ end
+ end
+
Deleted: community-i686/fish.install
===================================================================
--- community-i686/fish.install 2014-11-26 17:53:28 UTC (rev 123158)
+++ community-i686/fish.install 2014-11-26 17:53:43 UTC (rev 123159)
@@ -1,17 +0,0 @@
-post_install() {
- grep -q '/usr/bin/fish' etc/shells || echo '/usr/bin/fish' >> etc/shells
-}
-
-post_upgrade() {
- post_install
-
- if [[ "$(vercmp $2 2.1.1)" -lt 0 ]]; then
- echo ":: With fish 2.1.1 release, the fishd socket has changed location due"
- echo " to security concerns. To make fish pick up the changes, kill all"
- echo " fishd processes."
- fi
-}
-
-pre_remove() {
- sed -i '/^\/usr\/bin\/fish/d' /etc/shells
-}
Copied: fish/repos/community-i686/fish.install (from rev 123158, fish/trunk/fish.install)
===================================================================
--- community-i686/fish.install (rev 0)
+++ community-i686/fish.install 2014-11-26 17:53:43 UTC (rev 123159)
@@ -0,0 +1,17 @@
+post_install() {
+ grep -q '/usr/bin/fish' etc/shells || echo '/usr/bin/fish' >> etc/shells
+}
+
+post_upgrade() {
+ post_install
+
+ if [[ "$(vercmp $2 2.1.1)" -lt 0 ]]; then
+ echo ":: With fish 2.1.1 release, the fishd socket has changed location due"
+ echo " to security concerns. To make fish pick up the changes, kill all"
+ echo " fishd processes."
+ fi
+}
+
+pre_remove() {
+ sed -i '/^\/usr\/bin\/fish/d' /etc/shells
+}
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-11-26 17:53:28 UTC (rev 123158)
+++ community-x86_64/PKGBUILD 2014-11-26 17:53:43 UTC (rev 123159)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Kaiting Chen <kaitocracy at gmail.com>
-# Contributor: Abhishek Dasgupta <abhidg at gmail.com>
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: Jan Fader <jan.fader at web.de>
-
-pkgname=fish
-pkgver=2.1.1
-pkgrel=4
-pkgdesc='Smart and user friendly shell intended mostly for interactive use'
-arch=('i686' 'x86_64')
-url='http://fishshell.com/'
-license=('GPL2')
-depends=('bc' 'gcc-libs' 'inetutils' 'ncurses' 'which')
-optdepends=('python: for manual page completion parser and web configuration tool')
-makedepends=('doxygen')
-install=fish.install
-source=(https://github.com/fish-shell/fish-shell/archive/$pkgver.tar.gz)
-md5sums=('9c6e98985636b5268eae2da0ff79311d')
-
-prepare() {
- cd fish-shell-$pkgver
- echo $pkgver > version
- autoconf -i
-}
-
-build() {
- cd fish-shell-$pkgver
- ./configure --prefix=/usr \
- --sysconfdir=/etc
- make
-}
-
-package() {
- make -C fish-shell-$pkgver DESTDIR="$pkgdir" install
-}
Copied: fish/repos/community-x86_64/PKGBUILD (from rev 123158, fish/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-11-26 17:53:43 UTC (rev 123159)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Kaiting Chen <kaitocracy at gmail.com>
+# Contributor: Abhishek Dasgupta <abhidg at gmail.com>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: Jan Fader <jan.fader at web.de>
+
+pkgname=fish
+pkgver=2.1.1
+pkgrel=5
+pkgdesc='Smart and user friendly shell intended mostly for interactive use'
+arch=('i686' 'x86_64')
+url='http://fishshell.com/'
+license=('GPL2')
+depends=('bc' 'gcc-libs' 'inetutils' 'ncurses' 'which')
+optdepends=('python: for manual page completion parser and web configuration tool')
+makedepends=('doxygen')
+install=fish.install
+source=(https://github.com/fish-shell/fish-shell/archive/$pkgver.tar.gz
+ fish-2.1.1-grep-options-is-deprecated.patch)
+md5sums=('9c6e98985636b5268eae2da0ff79311d'
+ '0c94b1ca8c54ed1a03b551f9b84160e5')
+
+prepare() {
+ cd fish-shell-$pkgver
+ patch -p1 -i ../fish-2.1.1-grep-options-is-deprecated.patch
+
+ echo $pkgver > version
+ autoconf -i
+}
+
+build() {
+ cd fish-shell-$pkgver
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc
+ make
+}
+
+package() {
+ make -C fish-shell-$pkgver DESTDIR="$pkgdir" install
+}
Copied: fish/repos/community-x86_64/fish-2.1.1-grep-options-is-deprecated.patch (from rev 123158, fish/trunk/fish-2.1.1-grep-options-is-deprecated.patch)
===================================================================
--- community-x86_64/fish-2.1.1-grep-options-is-deprecated.patch (rev 0)
+++ community-x86_64/fish-2.1.1-grep-options-is-deprecated.patch 2014-11-26 17:53:43 UTC (rev 123159)
@@ -0,0 +1,15 @@
+diff --git a/share/functions/grep.fish b/share/functions/grep.fish
+index b0dc958..cd7c31b 100644
+--- a/share/functions/grep.fish
++++ b/share/functions/grep.fish
+@@ -6,8 +6,8 @@ if command grep --color=auto --help 1>/dev/null 2>/dev/null
+ if not set -q GREP_COLOR
+ set -gx GREP_COLOR '97;45'
+ end
+- if not set -q GREP_OPTIONS
+- set -gx GREP_OPTIONS --color=auto
++ function grep
++ command grep --color=auto $argv
+ end
+ end
+
Deleted: community-x86_64/fish.install
===================================================================
--- community-x86_64/fish.install 2014-11-26 17:53:28 UTC (rev 123158)
+++ community-x86_64/fish.install 2014-11-26 17:53:43 UTC (rev 123159)
@@ -1,17 +0,0 @@
-post_install() {
- grep -q '/usr/bin/fish' etc/shells || echo '/usr/bin/fish' >> etc/shells
-}
-
-post_upgrade() {
- post_install
-
- if [[ "$(vercmp $2 2.1.1)" -lt 0 ]]; then
- echo ":: With fish 2.1.1 release, the fishd socket has changed location due"
- echo " to security concerns. To make fish pick up the changes, kill all"
- echo " fishd processes."
- fi
-}
-
-pre_remove() {
- sed -i '/^\/usr\/bin\/fish/d' /etc/shells
-}
Copied: fish/repos/community-x86_64/fish.install (from rev 123158, fish/trunk/fish.install)
===================================================================
--- community-x86_64/fish.install (rev 0)
+++ community-x86_64/fish.install 2014-11-26 17:53:43 UTC (rev 123159)
@@ -0,0 +1,17 @@
+post_install() {
+ grep -q '/usr/bin/fish' etc/shells || echo '/usr/bin/fish' >> etc/shells
+}
+
+post_upgrade() {
+ post_install
+
+ if [[ "$(vercmp $2 2.1.1)" -lt 0 ]]; then
+ echo ":: With fish 2.1.1 release, the fishd socket has changed location due"
+ echo " to security concerns. To make fish pick up the changes, kill all"
+ echo " fishd processes."
+ fi
+}
+
+pre_remove() {
+ sed -i '/^\/usr\/bin\/fish/d' /etc/shells
+}
More information about the arch-commits
mailing list