From e2ba73af6342fed58c1b26391f105a447110d520 Mon Sep 17 00:00:00 2001 From: Luke Ashe-Browne Date: Wed, 28 Aug 2024 23:01:36 +0100 Subject: feat(tailscale): new tailscale plugin (#12523) --- plugins/tailscale/tailscale.plugin.zsh | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 plugins/tailscale/tailscale.plugin.zsh (limited to 'plugins/tailscale/tailscale.plugin.zsh') diff --git a/plugins/tailscale/tailscale.plugin.zsh b/plugins/tailscale/tailscale.plugin.zsh new file mode 100644 index 000000000..ae664a665 --- /dev/null +++ b/plugins/tailscale/tailscale.plugin.zsh @@ -0,0 +1,4 @@ + +if [ $commands[tailscale] ]; then + source <(tailscale completion zsh) +fi -- cgit v1.2.3-70-g09d2 From ea8068aa3eeecc785249f2e83289e8a9294b9d6b Mon Sep 17 00:00:00 2001 From: Carlo Sala Date: Thu, 29 Aug 2024 12:19:19 +0200 Subject: fix(tailscale): make completion loading async --- plugins/tailscale/tailscale.plugin.zsh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'plugins/tailscale/tailscale.plugin.zsh') diff --git a/plugins/tailscale/tailscale.plugin.zsh b/plugins/tailscale/tailscale.plugin.zsh index ae664a665..7f0b1414a 100644 --- a/plugins/tailscale/tailscale.plugin.zsh +++ b/plugins/tailscale/tailscale.plugin.zsh @@ -1,4 +1,13 @@ +if (( ! $+commands[tailscale] )); then + return +fi -if [ $commands[tailscale] ]; then - source <(tailscale completion zsh) +# If the completion file doesn't exist yet, we need to autoload it and +# bind it to `tailscale`. Otherwise, compinit will have already done that. +if [[ ! -f "$ZSH_CACHE_DIR/completions/_tailscale" ]]; then + typeset -g -A _comps + autoload -Uz _tailscale + _comps[tailscale]=_tailscale fi + +tailscale completion zsh >| "$ZSH_CACHE_DIR/completions/_tailscale" &| -- cgit v1.2.3-70-g09d2 From e636eeb6963edf52d726112155bd9712654e2381 Mon Sep 17 00:00:00 2001 From: Hu Yufan <58105986+Hyffer@users.noreply.github.com> Date: Wed, 20 Nov 2024 03:34:28 +0800 Subject: fix(tailscale): load completion when `tailscale` is an alias (#12726) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes it work when Tailscale is installed via App Store: https://tailscale.com/kb/1080/cli?tab=macos. Co-authored-by: Marc Cornellà --- plugins/tailscale/tailscale.plugin.zsh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'plugins/tailscale/tailscale.plugin.zsh') diff --git a/plugins/tailscale/tailscale.plugin.zsh b/plugins/tailscale/tailscale.plugin.zsh index 7f0b1414a..e0e011196 100644 --- a/plugins/tailscale/tailscale.plugin.zsh +++ b/plugins/tailscale/tailscale.plugin.zsh @@ -1,4 +1,4 @@ -if (( ! $+commands[tailscale] )); then +if (( ! $+commands[tailscale] && ! $+aliases[tailscale] )); then return fi @@ -7,7 +7,12 @@ fi if [[ ! -f "$ZSH_CACHE_DIR/completions/_tailscale" ]]; then typeset -g -A _comps autoload -Uz _tailscale - _comps[tailscale]=_tailscale + + if (( $+commands[tailscale] )); then + _comps[tailscale]=_tailscale + elif (( $+aliases[tailscale] )); then + _comps[${aliases[tailscale]:t}]=_tailscale + fi fi tailscale completion zsh >| "$ZSH_CACHE_DIR/completions/_tailscale" &| -- cgit v1.2.3-70-g09d2 From 501f29f90c67bfb47506715c894e710c46ae3e0e Mon Sep 17 00:00:00 2001 From: Marc Cornellà Date: Thu, 23 Jan 2025 20:10:10 +0100 Subject: fix(tailscale): fix completion binding for alias to `Tailscale` (#12928) Fixes #12928 --- plugins/tailscale/tailscale.plugin.zsh | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'plugins/tailscale/tailscale.plugin.zsh') diff --git a/plugins/tailscale/tailscale.plugin.zsh b/plugins/tailscale/tailscale.plugin.zsh index e0e011196..8b4e1e34d 100644 --- a/plugins/tailscale/tailscale.plugin.zsh +++ b/plugins/tailscale/tailscale.plugin.zsh @@ -15,4 +15,11 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_tailscale" ]]; then fi fi +# If using the alias, let's make sure that the aliased executable is also bound +# in case the alias points to "Tailscale" instead of "tailscale". +# See https://github.com/ohmyzsh/ohmyzsh/discussions/12928 +if (( $+aliases[tailscale] )); then + _comps[${aliases[tailscale]:t}]=_tailscale +fi + tailscale completion zsh >| "$ZSH_CACHE_DIR/completions/_tailscale" &| -- cgit v1.2.3-70-g09d2