Call oc to generate completions

2 files changed, 4 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 987bdb1157cd..3198e7e07fe8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = origin-client
 	pkgdesc = Openshift client
 	pkgver = 3.11.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/openshift/origin
 	arch = x86_64
 	license = Apache
diff --git a/PKGBUILD b/PKGBUILD
index e5db019cbe18..87464b8308dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 pkgname=origin-client
 pkgdesc="Openshift client"
 pkgver=3.11.0
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url="https://github.com/openshift/origin"
 license=('Apache')
@@ -13,9 +13,6 @@ sha256sums=('SKIP')
 build() {
   cd "${srcdir}/origin"
 
-  # Fix zsh completion
-  sed -i 's/kubectl/oc/g' contrib/completions/zsh/oc
-
   make WHAT=cmd/oc
   hack/generate-docs.sh
 }
@@ -25,6 +22,6 @@ package() {
   install -Dm755 _output/local/bin/linux/amd64/oc -t "$pkgdir/usr/bin"
   install -Dm644 docs/man/man1/* -t "$pkgdir/usr/share/man/man1"
 
-  install -Dm644 contrib/completions/bash/oc "$pkgdir/usr/share/bash-completion/completions/oc"
-  install -Dm644 contrib/completions/zsh/oc "$pkgdir/usr/share/zsh/site-functions/_oc"
+  "$pkgdir/usr/bin/oc" completion bash | install -Dm644 /dev/stdin "$pkgdir/usr/share/bash-completion/completions/oc"
+  "$pkgdir/usr/bin/oc" completion zsh | sed 's/kubectl/oc/g' | install -Dm644 /dev/stdin "$pkgdir/usr/share/zsh/site-functions/_oc"
 }