From 12bfcf7f9699b115c5625fb68619dd7d0996ab0a Mon Sep 17 00:00:00 2001 From: Daniil Fedotov Date: Tue, 17 Jan 2017 18:36:48 +0000 Subject: [PATCH] Fix autocomplete scripts file names --- packaging/RPMS/Fedora/rabbitmq-server.spec | 4 ++-- packaging/debs/Debian/debian/dirs | 1 + packaging/debs/Debian/debian/rules | 5 ++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index 16a4ce41a8..9dbf0e9d6c 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -41,7 +41,7 @@ RabbitMQ is an open source multi-protocol messaging broker. %define _rabbit_server_ocf scripts/rabbitmq-server.ocf %define _plugins_state_dir %{_localstatedir}/lib/rabbitmq/plugins %define _rabbit_server_ha_ocf scripts/rabbitmq-server-ha.ocf -%define _rabbitmqctl_autocomplete scripts/rabbitmqctl-autocomplete +%define _rabbitmqctl_autocomplete scripts/rabbitmqctl-autocomplete.sh %define _maindir %{buildroot}%{_rabbit_erllibdir} @@ -73,7 +73,7 @@ install -p -D -m 0755 %{S:1} %{buildroot}%{_initrddir}/rabbitmq-server install -p -D -m 0755 %{_rabbit_server_ocf} %{buildroot}%{_exec_prefix}/lib/ocf/resource.d/rabbitmq/rabbitmq-server install -p -D -m 0755 %{_rabbit_server_ha_ocf} %{buildroot}%{_exec_prefix}/lib/ocf/resource.d/rabbitmq/rabbitmq-server-ha install -p -D -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/logrotate.d/rabbitmq-server -install -p -d -m 0755 %{_rabbitmqctl_autocomplete} %{buildroot}%{_sysconfdir}/profile.d/rabbitmqctl-autocomplete +install -p -d -m 0755 %{_rabbitmqctl_autocomplete} %{buildroot}%{_sysconfdir}/profile.d/rabbitmqctl-autocomplete.sh mkdir -p %{buildroot}%{_sysconfdir}/rabbitmq diff --git a/packaging/debs/Debian/debian/dirs b/packaging/debs/Debian/debian/dirs index 625b7d41f5..a18fa4b151 100644 --- a/packaging/debs/Debian/debian/dirs +++ b/packaging/debs/Debian/debian/dirs @@ -5,5 +5,6 @@ usr/share/man var/lib/rabbitmq/mnesia var/log/rabbitmq etc/logrotate.d +ets/profile.d etc/rabbitmq diff --git a/packaging/debs/Debian/debian/rules b/packaging/debs/Debian/debian/rules index d766634968..99eea4932c 100755 --- a/packaging/debs/Debian/debian/rules +++ b/packaging/debs/Debian/debian/rules @@ -40,7 +40,6 @@ override_dh_auto_install: cp -a $(DEB_DESTDIR)$(PREFIX)/sbin/rabbitmqctl \ $(DEB_DESTDIR)$(PREFIX)/sbin/$$script; \ done - install -p -D -m 0644 debian/rabbitmq-server.default \ $(DEB_DESTDIR)/etc/default/rabbitmq-server @@ -49,8 +48,8 @@ override_dh_auto_install: install -p -D -m 0755 scripts/rabbitmq-server-ha.ocf \ $(DEB_DESTDIR)$(PREFIX)/lib/ocf/resource.d/rabbitmq/rabbitmq-server-ha - install -p -D -m 0755 scripts/rabbitmqctl-autocomplete \ - $(DEB_DESTDIR)/etc/profile.d/ + install -p -D -m 0755 scripts/rabbitmqctl-autocomplete.sh \ + $(DEB_DESTDIR)/etc/profile.d/rabbitmqctl-autocomplete.sh rm $(DEB_DESTDIR)$(RMQ_ERLAPP_DIR)/LICENSE* \ $(DEB_DESTDIR)$(RMQ_ERLAPP_DIR)/INSTALL