From af41403a5b9ed20f8a523711b5b9a2ede54f86cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Tue, 19 Nov 2024 20:30:47 +0100 Subject: [PATCH] Optimize and use idiomatic zsh --- plugins/tailscale/tailscale.plugin.zsh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/plugins/tailscale/tailscale.plugin.zsh b/plugins/tailscale/tailscale.plugin.zsh index 120675d1e..e0e011196 100644 --- a/plugins/tailscale/tailscale.plugin.zsh +++ b/plugins/tailscale/tailscale.plugin.zsh @@ -1,4 +1,4 @@ -if (( ! ($+commands[tailscale] || $+aliases[tailscale]) )); then +if (( ! $+commands[tailscale] && ! $+aliases[tailscale] )); then return fi @@ -7,10 +7,11 @@ fi if [[ ! -f "$ZSH_CACHE_DIR/completions/_tailscale" ]]; then typeset -g -A _comps autoload -Uz _tailscale - _comps[tailscale]=_tailscale - if (( $+aliases[tailscale] )); then - # `basename "$(alias tailscale | sed "s/.*=\(.*\)/\1/")"` should output executable name - compdef "$(basename "$(alias tailscale | sed "s/.*=\(.*\)/\1/")")"="tailscale" + + if (( $+commands[tailscale] )); then + _comps[tailscale]=_tailscale + elif (( $+aliases[tailscale] )); then + _comps[${aliases[tailscale]:t}]=_tailscale fi fi