Accepting request 595956 from home:jengelh:branches:shells

- Trim some bias from description.
- Anchor grep patterns in %post(un) so that it does not erroneously
  match other lines.

OBS-URL: https://build.opensuse.org/request/show/595956
OBS-URL: https://build.opensuse.org/package/show/shells/fish?expand=0&rev=35
This commit is contained in:
Matthias Mailänder 2018-04-15 15:41:42 +00:00 committed by Git OBS Bridge
parent 897106fb2e
commit 73cf86adf1
2 changed files with 13 additions and 8 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Apr 12 11:41:42 UTC 2018 - jengelh@inai.de
- Trim some bias from description.
- Anchor grep patterns in %post(un) so that it does not erroneously
match other lines.
-------------------------------------------------------------------
Sat Mar 31 23:37:20 UTC 2018 - avindra@opensuse.org

View File

@ -19,7 +19,7 @@
Name: fish
Version: 2.7.1
Release: 0
Summary: A user friendly interactive shell
Summary: The "friendly interactive shell"
License: GPL-2.0-only
Group: System/Shells
Url: https://fishshell.com/
@ -37,10 +37,8 @@ Requires: man
Recommends: terminfo
%description
fish is a user friendly command line shell for UNIX-like operating systems
such as Linux.
It's geared towards interactive use and its features are focused on user
fish is a command line shell.
It is geared towards interactive use and its features are focused on user
friendlieness and discoverability. The language syntax is simple but
incompatible with other shell languages.
@ -55,7 +53,7 @@ This package contains development files for the fish shell.
%setup -q
# fix E: env-script-interpreter
find ./share/tools -type f -name *.py -exec sed -i -r '1s|^#!%{_bindir}/env |#!%{_bindir}/|' {} \;
find share/tools -type f -name *.py -exec sed -i -r '1s|^#!%{_bindir}/env |#!%{_bindir}/|' {} +
%build
%configure \
@ -69,14 +67,14 @@ make %{?_smp_mflags}
%post
# Add fish to the list of allowed shells in /etc/shells
if ! grep %{_bindir}/%{name} %{_sysconfdir}/shells >/dev/null; then
if ! grep -q '^%{_bindir}/%{name}$' %{_sysconfdir}/shells; then
echo %{_bindir}/%{name} >>%{_sysconfdir}/shells
fi
%postun
# Remove fish from the list of allowed shells in /etc/shells
if [ "$1" = 0 ]; then
grep -v %{_bindir}/%{name} %{_sysconfdir}/shells >%{_sysconfdir}/%{name}.tmp
grep -v '^%{_bindir}/%{name}$' %{_sysconfdir}/shells >%{_sysconfdir}/%{name}.tmp
mv %{_sysconfdir}/%{name}.tmp %{_sysconfdir}/shells
fi