Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix install bash and zsh completion #516

Merged
merged 1 commit into from
Dec 13, 2019
+15 −7
Merged

Fix install bash and zsh completion #516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion tekton/debbuild/container/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ RUN set -ex \
equivs \
vim \
libdistro-info-perl \
bash-completion \
golang-any \
devscripts \
debhelper \
Expand Down
6 changes: 5 additions & 1 deletion tekton/debbuild/container/buildpackage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/bin/bash
set -eux
# Increase this on minor *package* releases (ie fix on the packaging),
# decrease it to 0 on major *package* release
# (need ot find a better way to do that)
RELEASE=2

[[ -z ${GPG_KEY} ]] && {
echo "You need to setup your GPG_KEY."
Expand Down Expand Up @@ -32,7 +36,7 @@ cd cli-${version}
# Make it easy for devs
[[ -d /debian ]] && { rm -rf debian && cp -a /debian . ; }

dch -M -v ${version}-1 -D $(sed -n '/DISTRIB_CODENAME/ { s/.*=//;p;;}' /etc/lsb-release) "new update"
dch -M -v ${version}-${RELEASE} -D $(sed -n '/DISTRIB_CODENAME/ { s/.*=//;p;;}' /etc/lsb-release) "new update"

gpgconf --kill gpg-agent && gpg-agent --pinentry-program /usr/bin/pinentry-curses --verbose --daemon
debuild -S --force-sign -k${GPG_KEY}
Expand Down
6 changes: 6 additions & 0 deletions tekton/debbuild/control/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
tektoncd-cli (0.6.0-2) stable; urgency=medium

* Fix Bash and ZSH Completion

-- Chmouel Boudjnah <[email protected]> Tue, 10 Dec 2019 16:54:58 +0000

tektoncd-cli (0.5.1-1) stable; urgency=medium

* Initial release.
Expand Down
3 changes: 1 addition & 2 deletions tekton/debbuild/control/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ Priority: optional
Standards-Version: 4.3.0
Build-Depends: debhelper (>= 11),
dh-golang (>= 1.34~),
golang-any (>= 2:1.12~),
bash-completion
golang-any (>= 2:1.12~)
Vcs-Git: https://github.com/tektoncd/cli.git

Package: tektoncd-cli
Expand Down
6 changes: 3 additions & 3 deletions tekton/debbuild/control/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ endif
BUILD_DATE := $(BUILD_DATE:+0000=Z)

%:
dh $@
dh $@

override_dh_auto_build:
export XDG_CACHE_HOME=/tmp/cache ; \
Expand All @@ -25,5 +25,5 @@ override_dh_auto_test:

override_dh_auto_install:
dh_auto_install -O--buildsystem=golang
dh_bash-completion -O--buildsystem=golang
install -D -m644 debian/tkn.zsh-completion debian/tektoncd-cli/usr/share/zsh/vendor-completions/_zsh
install -D -m644 debian/tkn.zsh-completion debian/tektoncd-cli/usr/share/zsh/vendor-completions/_tkn
install -D -m644 debian/tkn.zsh-completion debian/tektoncd-cli/usr/share/bash-completion/completions/tkn