From 640f78a23cc3e362588d421a9c51763e01a275cf Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 17 May 2018 12:17:21 -0400 Subject: [PATCH] fix: put bash-completion files in correct place [ci skip] --- .dockerignore | 1 + deb.mk | 4 ++-- rpm.mk | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.dockerignore b/.dockerignore index c49b5c3b1..681b95662 100644 --- a/.dockerignore +++ b/.dockerignore @@ -7,3 +7,4 @@ docs tests !contrib/dokku-installer.py !contrib/dokku-update +!contrib/bash-completion \ No newline at end of file diff --git a/deb.mk b/deb.mk index 9332c5a02..33d6074bb 100644 --- a/deb.mk +++ b/deb.mk @@ -117,7 +117,7 @@ deb-dokku: mkdir -p /tmp/tmp /tmp/build cp -r debian /tmp/build/DEBIAN - mkdir -p /tmp/build/etc/bash_completion.d + mkdir -p /tmp/build/usr/share/bash-completion/completions mkdir -p /tmp/build/usr/bin mkdir -p /tmp/build/usr/share/doc/dokku mkdir -p /tmp/build/usr/share/dokku/contrib @@ -127,7 +127,7 @@ deb-dokku: cp dokku /tmp/build/usr/bin cp LICENSE /tmp/build/usr/share/doc/dokku/copyright - cp contrib/bash-completion /tmp/build/etc/bash_completion.d/dokku + cp contrib/bash-completion /tmp/build/usr/share/bash-completion/completions/dokku find . -name ".DS_Store" -depth -exec rm {} \; $(MAKE) go-build cp common.mk /tmp/build/var/lib/dokku/core-plugins/common.mk diff --git a/rpm.mk b/rpm.mk index 083de3917..9fe76e747 100644 --- a/rpm.mk +++ b/rpm.mk @@ -51,7 +51,7 @@ rpm-dokku: rm -rf /tmp/tmp /tmp/build dokku_*_$(RPM_ARCHITECTURE).rpm mkdir -p /tmp/tmp /tmp/build - mkdir -p /tmp/build/etc/bash_completion.d + mkdir -p /tmp/build/usr/share/bash-completion/completions mkdir -p /tmp/build/usr/bin mkdir -p /tmp/build/usr/share/doc/dokku mkdir -p /tmp/build/usr/share/dokku/contrib @@ -61,7 +61,7 @@ rpm-dokku: cp dokku /tmp/build/usr/bin cp LICENSE /tmp/build/usr/share/doc/dokku/copyright - cp contrib/bash-completion /tmp/build/etc/bash_completion.d/dokku + cp contrib/bash-completion /tmp/build/usr/share/bash-completion/completions/dokku find . -name ".DS_Store" -depth -exec rm {} \; $(MAKE) go-build cp common.mk /tmp/build/var/lib/dokku/core-plugins/common.mk