From ec3cb127b2803712a1c19127f6a7382748675fcb Mon Sep 17 00:00:00 2001 From: gsspdev Date: Tue, 1 Oct 2024 02:18:46 -0500 Subject: [PATCH 1/7] fix(fastfile): use idiomatic expressions (#12708) --- plugins/fastfile/fastfile.plugin.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/fastfile/fastfile.plugin.zsh b/plugins/fastfile/fastfile.plugin.zsh index 896fed5f7..86f224b71 100644 --- a/plugins/fastfile/fastfile.plugin.zsh +++ b/plugins/fastfile/fastfile.plugin.zsh @@ -5,8 +5,8 @@ # If they are not set yet, they will be # overwritten with their default values -default fastfile_dir "${HOME}/.fastfile" -default fastfile_var_prefix "§" +fastfile_dir="${fastfile_dir:-${HOME}/.fastfile}" +fastfile_var_prefix="${fastfile_var_prefix:-§}" ########################### # Impl From f4423ebd09fbc7670815c3c20cc86c81b7319e5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Thu, 26 Sep 2024 13:12:53 +0200 Subject: [PATCH 2/7] feat(cli): style plugin README in `omz plugin info` --- lib/cli.zsh | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/lib/cli.zsh b/lib/cli.zsh index 383b0cfb0..d1896f18d 100644 --- a/lib/cli.zsh +++ b/lib/cli.zsh @@ -397,8 +397,23 @@ function _omz::plugin::info { local readme for readme in "$ZSH_CUSTOM/plugins/$1/README.md" "$ZSH/plugins/$1/README.md"; do if [[ -f "$readme" ]]; then - (( ${+commands[less]} )) && less "$readme" || cat "$readme" - return 0 + # If being piped, just cat the README + if [[ ! -t 1 ]]; then + cat "$readme" + return $? + fi + + # Enrich the README display depending on the tools we have + # - glow: https://github.com/charmbracelet/glow + # - bat: https://github.com/sharkdp/bat + # - less: typical pager command + case 1 in + ${+commands[glow]}) glow -p "$readme" ;; + ${+commands[bat]}) bat -l md --style plain "$readme" ;; + ${+commands[less]}) less "$readme" ;; + *) cat "$readme" ;; + esac + return $? fi done From dae5a4115917e2b9c65d9166c5d64df693f70dd4 Mon Sep 17 00:00:00 2001 From: za Date: Wed, 2 Oct 2024 15:49:31 +0700 Subject: [PATCH 3/7] feat(opentofu): add `apply -auto-approve` alias (#12714) --- plugins/opentofu/README.md | 35 ++++++++++++++-------------- plugins/opentofu/opentofu.plugin.zsh | 1 + 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/plugins/opentofu/README.md b/plugins/opentofu/README.md index 9811e2751..cc6e94acd 100644 --- a/plugins/opentofu/README.md +++ b/plugins/opentofu/README.md @@ -15,23 +15,24 @@ plugins=(... opentofu) ## Aliases -| Alias | Command | -|--------|-----------------------| -| `tt` | `tofu` | -| `tta` | `tofu apply` | -| `ttc` | `tofu console` | -| `ttd` | `tofu destroy` | -| `ttf` | `tofu fmt` | -| `ttfr` | `tofu fmt -recursive` | -| `tti` | `tofu init` | -| `tto` | `tofu output` | -| `ttp` | `tofu plan` | -| `ttv` | `tofu validate` | -| `tts` | `tofu state` | -| `ttsh` | `tofu show` | -| `ttr` | `tofu refresh` | -| `ttt` | `tofu test` | -| `ttws` | `tofu workspace` | +| Alias | Command | +|--------|------------------------------| +| `tt` | `tofu` | +| `tta` | `tofu apply` | +| `ttaa` | `tofu apply -auto-approve` | +| `ttc` | `tofu console` | +| `ttd` | `tofu destroy` | +| `ttf` | `tofu fmt` | +| `ttfr` | `tofu fmt -recursive` | +| `tti` | `tofu init` | +| `tto` | `tofu output` | +| `ttp` | `tofu plan` | +| `ttv` | `tofu validate` | +| `tts` | `tofu state` | +| `ttsh` | `tofu show` | +| `ttr` | `tofu refresh` | +| `ttt` | `tofu test` | +| `ttws` | `tofu workspace` | ## Prompt functions diff --git a/plugins/opentofu/opentofu.plugin.zsh b/plugins/opentofu/opentofu.plugin.zsh index aa6cac78a..79b102a74 100644 --- a/plugins/opentofu/opentofu.plugin.zsh +++ b/plugins/opentofu/opentofu.plugin.zsh @@ -29,6 +29,7 @@ function tofu_version_prompt_info() { alias tt='tofu' alias tta='tofu apply' +alias ttaa='tofu apply -auto-approve' alias ttc='tofu console' alias ttd='tofu destroy' alias ttf='tofu fmt' From 00b9b623858874c8b34c6f8dd72370e6ffa95dfc Mon Sep 17 00:00:00 2001 From: mnv Date: Wed, 2 Oct 2024 19:00:32 +0530 Subject: [PATCH 4/7] refactor(bzr): simplify and improve code (#12716) --- lib/bzr.zsh | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/lib/bzr.zsh b/lib/bzr.zsh index 005a16500..78273d578 100644 --- a/lib/bzr.zsh +++ b/lib/bzr.zsh @@ -1,10 +1,14 @@ ## Bazaar integration -## Just works with the GIT integration just add $(bzr_prompt_info) to the PROMPT +## Just works with the GIT integration. Add $(bzr_prompt_info) to the PROMPT function bzr_prompt_info() { - BZR_CB=`bzr nick 2> /dev/null | grep -v "ERROR" | cut -d ":" -f2 | awk -F / '{print "bzr::"$1}'` - if [ -n "$BZR_CB" ]; then - BZR_DIRTY="" - [[ -n `bzr status` ]] && BZR_DIRTY=" %{$fg[red]%} * %{$fg[green]%}" - echo "$ZSH_THEME_SCM_PROMPT_PREFIX$BZR_CB$BZR_DIRTY$ZSH_THEME_GIT_PROMPT_SUFFIX" - fi -} \ No newline at end of file + local bzr_branch + bzr_branch=$(bzr nick 2>/dev/null) || return + + if [[ -n "$bzr_branch" ]]; then + local bzr_dirty="" + if [[ -n $(bzr status 2>/dev/null) ]]; then + bzr_dirty=" %{$fg[red]%}*%{$reset_color%}" + fi + printf "%s%s%s%s" "$ZSH_THEME_SCM_PROMPT_PREFIX" "bzr::${bzr_branch##*:}" "$bzr_dirty" "$ZSH_THEME_GIT_PROMPT_SUFFIX" + fi +} From 7ce26a810d79fa65abdb6a9b47b64bed59f1eefc Mon Sep 17 00:00:00 2001 From: za Date: Thu, 3 Oct 2024 15:42:18 +0700 Subject: [PATCH 5/7] feat(opentofu): add `destroy -auto-approve` alias (#12719) --- plugins/opentofu/README.md | 1 + plugins/opentofu/opentofu.plugin.zsh | 1 + 2 files changed, 2 insertions(+) diff --git a/plugins/opentofu/README.md b/plugins/opentofu/README.md index cc6e94acd..56f116492 100644 --- a/plugins/opentofu/README.md +++ b/plugins/opentofu/README.md @@ -22,6 +22,7 @@ plugins=(... opentofu) | `ttaa` | `tofu apply -auto-approve` | | `ttc` | `tofu console` | | `ttd` | `tofu destroy` | +| `ttd!` | `tofu destroy -auto-approve` | | `ttf` | `tofu fmt` | | `ttfr` | `tofu fmt -recursive` | | `tti` | `tofu init` | diff --git a/plugins/opentofu/opentofu.plugin.zsh b/plugins/opentofu/opentofu.plugin.zsh index 79b102a74..bb65c12e3 100644 --- a/plugins/opentofu/opentofu.plugin.zsh +++ b/plugins/opentofu/opentofu.plugin.zsh @@ -32,6 +32,7 @@ alias tta='tofu apply' alias ttaa='tofu apply -auto-approve' alias ttc='tofu console' alias ttd='tofu destroy' +alias ttd!='tofu destroy -auto-approve' alias ttf='tofu fmt' alias ttfr='tofu fmt -recursive' alias tti='tofu init' From 0c8ce9d6adf9982c2f024c42f13b9781fd9846f0 Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Thu, 3 Oct 2024 01:47:33 -0700 Subject: [PATCH 6/7] fix(theme-chooser): use `env` in shebang (#12720) --- tools/theme_chooser.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/theme_chooser.sh b/tools/theme_chooser.sh index 3883f1d37..ab270e8e1 100755 --- a/tools/theme_chooser.sh +++ b/tools/theme_chooser.sh @@ -1,4 +1,4 @@ -#!/bin/zsh +#!/usr/bin/env zsh # Zsh Theme Chooser by fox (fox91 at anche dot no) # This program is free software. It comes without any warranty, to From 62cf1201b031399e7251abeee859e895ee825a48 Mon Sep 17 00:00:00 2001 From: So4resAlex <53014800+So4resAlex@users.noreply.github.com> Date: Thu, 3 Oct 2024 09:34:30 -0300 Subject: [PATCH 7/7] feat(terraform): add `destroy -auto-approve` alias (#12704) --- plugins/terraform/README.md | 1 + plugins/terraform/terraform.plugin.zsh | 1 + 2 files changed, 2 insertions(+) diff --git a/plugins/terraform/README.md b/plugins/terraform/README.md index 3f8ed6dee..feaf21d40 100644 --- a/plugins/terraform/README.md +++ b/plugins/terraform/README.md @@ -22,6 +22,7 @@ plugins=(... terraform) | `tfaa` | `terraform apply -auto-approve` | | `tfc` | `terraform console` | | `tfd` | `terraform destroy` | +| `tfd!` | `terraform destroy -auto-approve`| | `tff` | `terraform fmt` | | `tffr` | `terraform fmt -recursive` | | `tfi` | `terraform init` | diff --git a/plugins/terraform/terraform.plugin.zsh b/plugins/terraform/terraform.plugin.zsh index bedd46011..1c1d1b37e 100644 --- a/plugins/terraform/terraform.plugin.zsh +++ b/plugins/terraform/terraform.plugin.zsh @@ -20,6 +20,7 @@ alias tfa='terraform apply' alias tfaa='terraform apply -auto-approve' alias tfc='terraform console' alias tfd='terraform destroy' +alias 'tfd!'='terraform destroy -auto-approve' alias tff='terraform fmt' alias tffr='terraform fmt -recursive' alias tfi='terraform init'