rpms/grep
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Added script to check whether grep is coloured

Browse Source 
Resolves: rhbz#1034631
This commit is contained in:
Jaroslav Škarvada 2014-08-20 15:25:05 +02:00
parent fbfc56265c
commit 4ca30e887d
4 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
colorgrep.csh
View File

@ -1,13 +1,9 @@
# color-grep initialization # color-grep initialization
if ( -r /etc/GREP_COLORS ) then /usr/libexec/grepconf.sh -c
set color_none=`sed -n '/^COLOR.*none/Ip' < /etc/GREP_COLORS` if ( $status == 1 ) then
if ( "$color_none" != '' ) then exit
unset color_none
exit
endif
unset color_none
endif endif
alias grep 'grep --color=auto' alias grep 'grep --color=auto'

4
colorgrep.sh
View File

@ -1,8 +1,6 @@
# color-grep initialization # color-grep initialization
if [ -r /etc/GREP_COLORS ]; then /usr/libexec/grepconf.sh -c || return
grep -qi "^COLOR.*none" /etc/GREP_COLORS >/dev/null 2>/dev/null && return
fi
alias grep='grep --color=auto' 2>/dev/null alias grep='grep --color=auto' 2>/dev/null
alias egrep='egrep --color=auto' 2>/dev/null alias egrep='egrep --color=auto' 2>/dev/null

9
grep.spec
View File

@ -3,13 +3,14 @@
Summary: Pattern matching utilities Summary: Pattern matching utilities
Name: grep Name: grep
Version: 2.20 Version: 2.20
Release: 4%{?dist} Release: 5%{?dist}
License: GPLv3+ License: GPLv3+
Group: Applications/Text Group: Applications/Text
Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz
Source1: colorgrep.sh Source1: colorgrep.sh
Source2: colorgrep.csh Source2: colorgrep.csh
Source3: GREP_COLORS Source3: GREP_COLORS
Source4: grepconf.sh
# upstream ticket 39444 # upstream ticket 39444
Patch0: grep-2.20-man-fix-gs.patch Patch0: grep-2.20-man-fix-gs.patch
# upstream ticket 39445 # upstream ticket 39445
@ -57,6 +58,7 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
install -pm 644 %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d install -pm 644 %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir} install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}
install -Dpm 755 %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/grepconf.sh
%find_lang %name %find_lang %name
@ -85,8 +87,13 @@ fi
%config(noreplace) %{_sysconfdir}/GREP_COLORS %config(noreplace) %{_sysconfdir}/GREP_COLORS
%{_infodir}/*.info*.gz %{_infodir}/*.info*.gz
%{_mandir}/*/* %{_mandir}/*/*
%{_libexecdir}/grepconf.sh
%changelog %changelog
* Wed Aug 20 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 2.20-5
- Added script to check whether grep is coloured
Resolves: rhbz#1034631
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.20-4 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.20-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

11
grepconf.sh Normal file
View File

@ -0,0 +1,11 @@
#!/bin/sh
case "$1" in
-c | --interactive-color)
! grep -qsi "^COLOR.*none" /etc/GREP_COLORS
;;
*)
echo >&2 "Invalid / no option passed, so far only -c | --interactive-color is supported."
exit 1
;;
esac