From 3aa802cfd120ddcb2a0586781e7342bae71ad7ed Mon Sep 17 00:00:00 2001 From: Till Maas Date: Wed, 18 Feb 2015 21:46:20 +0100 Subject: [PATCH] Check functions (#1194044) - Use %license --- which.spec | 9 +++++++-- which2.sh | 6 +++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/which.spec b/which.spec index 8919828..ccc6be0 100644 --- a/which.spec +++ b/which.spec @@ -1,7 +1,7 @@ Summary: Displays where a particular program in your path is located Name: which Version: 2.20 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv3 Group: Applications/System Source0: http://www.xs4all.nl/~carlo17/which/%{name}-%{version}.tar.gz @@ -52,13 +52,18 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc COPYING EXAMPLES README AUTHORS NEWS +%license COPYING +%doc EXAMPLES README AUTHORS NEWS %attr(0644,root,root) %{_sysconfdir}/profile.d/which2.* %{_bindir}/* %{_infodir}/which.info.gz %{_mandir}/*/* %changelog +* Wed Feb 18 2015 Till Maas - 2.20-9 +- Check functions (#1194044) +- Use %%license + * Mon Aug 18 2014 Fedora Release Engineering - 2.20-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/which2.sh b/which2.sh index 14ca09f..ea517c2 100644 --- a/which2.sh +++ b/which2.sh @@ -1,4 +1,8 @@ # Initialization script for bash and sh # export AFS if you are in AFS environment -alias which='alias | /usr/bin/which --tty-only --read-alias --show-dot --show-tilde' +which () +{ + (alias; declare -f) | /usr/bin/which --tty-only --read-alias --read-functions --show-tilde --show-dot "$@" +} +export -f which