From 6f20bc3ef6a15778fa7bbd429be6aa9e69229986 Mon Sep 17 00:00:00 2001 From: Jens Binkert Date: Sat, 19 May 2018 10:33:33 +0200 Subject: [PATCH 1/2] openshift: add {bash,zsh}-completion --- pkgs/applications/networking/cluster/openshift/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 07c9e9ba678..c4a2e93e139 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -69,6 +69,12 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out/bin" cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$out/bin/" + mkdir -p "$out/etc/bash_completion.d" + cp -a contrib/completions/bash/oc "$out/etc/bash_completion.d" + cp -a contrib/completions/bash/openshift "$out/etc/bash_completion.d" + mkdir -p "$out/share/zsh/site-functions" + cp -a contrib/completions/zsh/oc "$out/share/zsh/site-functions" + cp -a contrib/completions/zsh/openshift "$out/share/zsh/site-functions" ''; preFixup = '' From fccf7f1181cefef80d3c1a62a25511cce36e4ae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 19 May 2018 11:47:39 +0100 Subject: [PATCH 2/2] openshift: simplify shell completion installation --- .../applications/networking/cluster/openshift/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index c4a2e93e139..79eb8bb233c 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -69,12 +69,8 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out/bin" cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$out/bin/" - mkdir -p "$out/etc/bash_completion.d" - cp -a contrib/completions/bash/oc "$out/etc/bash_completion.d" - cp -a contrib/completions/bash/openshift "$out/etc/bash_completion.d" - mkdir -p "$out/share/zsh/site-functions" - cp -a contrib/completions/zsh/oc "$out/share/zsh/site-functions" - cp -a contrib/completions/zsh/openshift "$out/share/zsh/site-functions" + install -D -t "$out/etc/bash_completion.d" contrib/completions/bash/* + install -D -t "$out/share/zsh/site-functions" contrib/completions/zsh/* ''; preFixup = ''