Skip to content

Commit

Permalink
[build] Drop legacy redirectors
Browse files Browse the repository at this point in the history
Following on from earlier work that added a deprecation message to the
`sosreport` and `sos-collector` redirectors about the commands being
dropped in sos-4.9, drop the redirectors and their manpage symlinks so
that only `sos` is available as an entry point.

Closes: #3374

Signed-off-by: Jake Hunsaker <[email protected]>
Signed-off-by: Pavel Moravec <[email protected]>
  • Loading branch information
TurboTurtle authored and pmoravec committed Feb 5, 2025
1 parent 4305ba2 commit b13a3cc
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 86 deletions.
36 changes: 0 additions & 36 deletions bin/sos-collector

This file was deleted.

36 changes: 0 additions & 36 deletions bin/sosreport

This file was deleted.

1 change: 0 additions & 1 deletion man/en/sos-collector.1

This file was deleted.

1 change: 0 additions & 1 deletion man/en/sosreport.1

This file was deleted.

7 changes: 3 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@
maintainer_email='[email protected]',
url='https://github.com/sosreport/sos',
license="GPLv2+",
scripts=['bin/sos', 'bin/sosreport', 'bin/sos-collector'],
scripts=['bin/sos'],
data_files=[
('share/man/man1', ['man/en/sosreport.1', 'man/en/sos-report.1',
'man/en/sos.1', 'man/en/sos-collect.1',
'man/en/sos-collector.1', 'man/en/sos-clean.1',
('share/man/man1', ['man/en/sos-report.1', 'man/en/sos.1',
'man/en/sos-collect.1', 'man/en/sos-clean.1',
'man/en/sos-mask.1', 'man/en/sos-help.1']),
('share/man/man5', ['man/en/sos.conf.5']),
('share/licenses/sos', ['LICENSE']),
Expand Down
4 changes: 0 additions & 4 deletions snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,3 @@ parts:
apps:
sos:
command: bin/sos
sosreport:
command: bin/sos report
sos-collector:
command: bin/sos collector
4 changes: 0 additions & 4 deletions sos.spec
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,8 @@ rm -rf %{buildroot}/usr/config/
%files
%if 0%{?fedora} >= 39
%{_bindir}/sos
%{_bindir}/sosreport
%{_bindir}/sos-collector
%else
%{_sbindir}/sos
%{_sbindir}/sosreport
%{_sbindir}/sos-collector
%endif
%dir /etc/sos/cleaner
%dir /etc/sos/presets.d
Expand Down

0 comments on commit b13a3cc

Please sign in to comment.