diff --git a/Makefile b/Makefile index ee54bbd83..0a958dd4b 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ test: MONGODB_VERSION=$(MONGO_TEST_VERSION) e2e-tests/run-all build: build-pbm build-agent build-stest -build-all: build build-entrypoint +build-all: build build-entrypoint completion build-k8s: build-all build-pbm: $(ENVS) go build -ldflags="$(LDFLAGS)" $(BUILD_FLAGS) -o ./bin/pbm ./cmd/pbm diff --git a/packaging/debian/install b/packaging/debian/install index c203d5daa..384d220eb 100644 --- a/packaging/debian/install +++ b/packaging/debian/install @@ -6,4 +6,10 @@ default/pbm-agent /etc/default/ pbm-storage.conf /etc/ pbm-agent.service /lib/systemd/system/ pbm-conf-reference.yml /etc/ +completions/bash/pbm-agent /usr/share/bash-completion/completions/ +completions/bash/pbm /usr/share/bash-completion/completions/ +completions/bash/pbm-speed-test /usr/share/bash-completion/completions/ +completions/zsh/_pbm-agent /usr/share/zsh/vendor-completions/ +completions/zsh/_pbm /usr/share/zsh/vendor-completions/ +completions/zsh/_pbm-speed-test /usr/share/zsh/vendor-completions/ LICENSE /usr/share/doc/percona-backup-mongodb/ diff --git a/packaging/debian/rules b/packaging/debian/rules index bc177cfc9..cffd43585 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -5,7 +5,7 @@ # As a special exception, when this file is copied by dh-make into a # dh-make output file, you may use that output file without restriction. # This special exception was added by Craig Small in version 0.37 of dh-make. -PHONY: override_dh_auto_build override_dh_auto_install +PHONY: override_dh_auto_build override_dh_auto_install # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 export DH_VERBOSE=1 @@ -58,10 +58,17 @@ override_dh_auto_install: @echo "RULES.$@" mkdir -p $(TMP) mkdir -p $(TMP)/default + mkdir -p $(TMP)/completions/bash + mkdir -p $(TMP)/completions/zsh cd build/src/github.com/percona/percona-backup-mongodb/bin && cp pbm-agent $(TMP)/pbm-agent cd build/src/github.com/percona/percona-backup-mongodb/bin && cp pbm $(TMP)/pbm cd build/src/github.com/percona/percona-backup-mongodb/bin && cp pbm-speed-test $(TMP)/pbm-speed-test - cd build/src/github.com/percona/percona-backup-mongodb/bin && cp pbm-agent-entrypoint $(TMP)/pbm-agent-entrypoint + cd build/src/github.com/percona/percona-backup-mongodb/bin && cp completions/bash/pbm-agent $(TMP)/completions/bash/pbm-agent + cd build/src/github.com/percona/percona-backup-mongodb/bin && cp completions/bash/pbm $(TMP)/completions/bash/pbm + cd build/src/github.com/percona/percona-backup-mongodb/bin && cp completions/bash/pbm-speed-test $(TMP)/completions/bash/pbm-speed-test + cd build/src/github.com/percona/percona-backup-mongodb/bin && cp completions/zsh/_pbm-agent $(TMP)/completions/zsh/_pbm-agent + cd build/src/github.com/percona/percona-backup-mongodb/bin && cp completions/zsh/_pbm $(TMP)/completions/zsh/_pbm + cd build/src/github.com/percona/percona-backup-mongodb/bin && cp completions/zsh/_pbm-speed-test $(TMP)/completions/zsh/_pbm-speed-test cp -f packaging/conf/pbm-storage.conf $(TMP)/pbm-storage.conf cp -f packaging/conf/pbm-agent.env $(TMP)/default/pbm-agent cp -f packaging/conf/pbm-agent.service $(TMP)/pbm-agent.service @@ -72,5 +79,3 @@ override_dh_auto_install: override_dh_systemd_start: dh_systemd_enable --name=pbm-agent pbm-agent.service dh_systemd_start --restart-after-upgrade - - diff --git a/packaging/rpm/mongodb-backup.spec b/packaging/rpm/mongodb-backup.spec index b0e9f246a..c97c59545 100644 --- a/packaging/rpm/mongodb-backup.spec +++ b/packaging/rpm/mongodb-backup.spec @@ -74,6 +74,14 @@ cp github.com/percona/percona-backup-mongodb/bin/pbm-agent $RPM_BUILD_ROOT/%{_bi cp github.com/percona/percona-backup-mongodb/bin/pbm $RPM_BUILD_ROOT/%{_bindir}/ cp github.com/percona/percona-backup-mongodb/bin/pbm-speed-test $RPM_BUILD_ROOT/%{_bindir}/ cp github.com/percona/percona-backup-mongodb/bin/pbm-agent-entrypoint $RPM_BUILD_ROOT/%{_bindir}/ +install -m 0755 -d $RPM_BUILD_ROOT/%{_datadir}/bash-completion/completions +install -m 0755 -d $RPM_BUILD_ROOT/%{_datadir}/zsh/site-functions +install -m 0644 github.com/percona/percona-backup-mongodb/bin/completions/bash/pbm-agent $RPM_BUILD_ROOT/%{_datadir}/bash-completion/completions/ +install -m 0644 github.com/percona/percona-backup-mongodb/bin/completions/bash/pbm $RPM_BUILD_ROOT/%{_datadir}/bash-completion/completions/ +install -m 0644 github.com/percona/percona-backup-mongodb/bin/completions/bash/pbm-speed-test $RPM_BUILD_ROOT/%{_datadir}/bash-completion/completions/ +install -m 0644 github.com/percona/percona-backup-mongodb/bin/completions/zsh/_pbm-agent $RPM_BUILD_ROOT/%{_datadir}/zsh/site-functions/ +install -m 0644 github.com/percona/percona-backup-mongodb/bin/completions/zsh/_pbm $RPM_BUILD_ROOT/%{_datadir}/zsh/site-functions/ +install -m 0644 github.com/percona/percona-backup-mongodb/bin/completions/zsh/_pbm-speed-test $RPM_BUILD_ROOT/%{_datadir}/zsh/site-functions/ install -m 0755 -d $RPM_BUILD_ROOT/%{_sysconfdir} install -m 0755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig install -D -m 0640 github.com/percona/percona-backup-mongodb/packaging/conf/pbm-storage.conf $RPM_BUILD_ROOT/%{_sysconfdir}/pbm-storage.conf @@ -149,6 +157,12 @@ esac %{_bindir}/pbm %{_bindir}/pbm-speed-test %{_bindir}/pbm-agent-entrypoint +%{_datadir}/bash-completion/completions/pbm-agent +%{_datadir}/bash-completion/completions/pbm +%{_datadir}/bash-completion/completions/pbm-speed-test +%{_datadir}/zsh/site-functions/_pbm-agent +%{_datadir}/zsh/site-functions/_pbm +%{_datadir}/zsh/site-functions/_pbm-speed-test %config(noreplace) %attr(0640,root,root) /%{_sysconfdir}/sysconfig/pbm-agent %config(noreplace) %attr(0640,mongod,mongod) /%{_sysconfdir}/pbm-storage.conf %{_sysconfdir}/pbm-conf-reference.yml