diff options
| author | Jonas Chevalier <zimbatm@zimbatm.com> | 2020-11-12 22:22:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-12 21:22:18 +0000 |
| commit | a7cb88c3def629f4d950d819254c27c1b328b2ac (patch) | |
| tree | d3dd7ffff60eb64d78eea70761f60830245e979c /pkgs/tools/admin | |
| parent | 3fceafce1eaa82c36a21153efbf7c1ee87af7b0e (diff) | |
tree-wide: unify Bash completions outputs (#103421)
Use $out/share/bash-completion/completions to store the Bash completions
Diffstat (limited to 'pkgs/tools/admin')
| -rw-r--r-- | pkgs/tools/admin/awscli/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/admin/awscli2/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/admin/bluemix-cli/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/admin/google-cloud-sdk/default.nix | 4 |
4 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 79d6f42628f3..7c78587a05e5 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -47,10 +47,12 @@ in with py.pkgs; buildPythonApplication rec { ]; postInstall = '' - mkdir -p $out/etc/bash_completion.d - echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli + mkdir -p $out/share/bash-completion/completions + echo "complete -C $out/bin/aws_completer aws" > $out/share/bash-completion/completions/awscli + mkdir -p $out/share/zsh/site-functions mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions + rm $out/bin/aws.cmd ''; diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index e89df04e3bd1..b6844767e608 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -67,10 +67,12 @@ with py.pkgs; buildPythonApplication rec { ]; postInstall = '' - mkdir -p $out/etc/bash_completion.d - echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli + mkdir -p $out/share/bash-completion/completions + echo "complete -C $out/bin/aws_completer aws" > $out/share/bash-completion/completions/awscli + mkdir -p $out/share/zsh/site-functions mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions + rm $out/bin/aws.cmd ''; diff --git a/pkgs/tools/admin/bluemix-cli/default.nix b/pkgs/tools/admin/bluemix-cli/default.nix index f97a6e5df891..b0a5af35def5 100644 --- a/pkgs/tools/admin/bluemix-cli/default.nix +++ b/pkgs/tools/admin/bluemix-cli/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { install -m755 -D -t $out/bin/cfcli bin/cfcli/cf ln -sv $out/bin/ibmcloud $out/bin/bx ln -sv $out/bin/ibmcloud $out/bin/bluemix - install -D -t "$out/etc/bash_completion.d" bx/bash_autocomplete + install -D -t "$out/share/bash-completion/completions" bx/bash_autocomplete install -D -t "$out/share/zsh/site-functions" bx/zsh_autocomplete ''; diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 53cbaf1229aa..904cab312286 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -74,8 +74,8 @@ in stdenv.mkDerivation rec { disable_update_check = true" >> $out/google-cloud-sdk/properties # setup bash completion - mkdir -p $out/etc/bash_completion.d - mv $out/google-cloud-sdk/completion.bash.inc $out/etc/bash_completion.d/gcloud.inc + mkdir -p $out/share/bash-completion/completions + mv $out/google-cloud-sdk/completion.bash.inc $out/share/bash-completion/completions/gcloud.inc # This directory contains compiled mac binaries. We used crcmod from # nixpkgs instead. |