diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml index 7dd5065d8..a17d66f4a 100644 --- a/.github/workflows/dependencies.yml +++ b/.github/workflows/dependencies.yml @@ -21,7 +21,7 @@ jobs: egress-policy: audit - name: Checkout - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: fetch-depth: 0 - name: Authenticate as @ohmyzsh diff --git a/.github/workflows/installer.yml b/.github/workflows/installer.yml index d306f170d..f0d1abb9b 100644 --- a/.github/workflows/installer.yml +++ b/.github/workflows/installer.yml @@ -31,7 +31,7 @@ jobs: egress-policy: audit - name: Set up git repository - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Install zsh if: runner.os == 'Linux' run: sudo apt-get update; sudo apt-get install zsh @@ -52,7 +52,7 @@ jobs: egress-policy: audit - name: Checkout - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Install Vercel CLI run: npm install -g vercel - name: Setup project and deploy diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d452123ef..52c297f3f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,7 +29,7 @@ jobs: egress-policy: audit - name: Set up git repository - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: Install zsh run: sudo apt-get update; sudo apt-get install zsh - name: Check syntax diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 05282bfcb..fa767fbcb 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -41,7 +41,7 @@ jobs: egress-policy: audit - name: "Checkout code" - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: persist-credentials: false @@ -60,6 +60,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0 + uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2 with: sarif_file: results.sarif diff --git a/lib/git.zsh b/lib/git.zsh index 3a03dbd4d..63482df6e 100644 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -162,13 +162,13 @@ if zstyle -t ':omz:alpha:lib:git' async-prompt \ # or any of the other prompt variables function _defer_async_git_register() { # Check if git_prompt_info is used in a prompt variable - case "${PS1}:${PS2}:${PS3}:${PS4}:${RPROMPT}:${RPS1}:${RPS2}:${RPS3}:${RPS4}" in + case "${PS1}:${PS2}:${PS3}:${PS4}:${RPROMPT-}:${RPS1-}:${RPS2-}:${RPS3-}:${RPS4-}" in *(\$\(git_prompt_info\)|\`git_prompt_info\`)*) _omz_register_handler _omz_git_prompt_info ;; esac - case "${PS1}:${PS2}:${PS3}:${PS4}:${RPROMPT}:${RPS1}:${RPS2}:${RPS3}:${RPS4}" in + case "${PS1}:${PS2}:${PS3}:${PS4}:${RPROMPT-}:${RPS1-}:${RPS2-}:${RPS3-}:${RPS4-}" in *(\$\(git_prompt_status\)|\`git_prompt_status\`)*) _omz_register_handler _omz_git_prompt_status ;; diff --git a/plugins/ansible/ansible.plugin.zsh b/plugins/ansible/ansible.plugin.zsh index 75393b704..bfe7f8cb4 100644 --- a/plugins/ansible/ansible.plugin.zsh +++ b/plugins/ansible/ansible.plugin.zsh @@ -1,13 +1,13 @@ # Functions -function ansible-version(){ +function ansible-version() { ansible --version } -function ansible-role-init(){ - if ! [ -z $1 ] ; then +function ansible-role-init() { + if [[ -n "$1" ]]; then echo "Ansible Role : $1 Creating...." - ansible-galaxy init $1 - tree $1 + ansible-galaxy init "$1" + tree "$1" else echo "Usage : ansible-role-init " echo "Example : ansible-role-init role1" diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh index 0c43031df..677bf3236 100644 --- a/plugins/aws/aws.plugin.zsh +++ b/plugins/aws/aws.plugin.zsh @@ -9,14 +9,14 @@ function agr() { # Update state file if enabled function _aws_update_state() { if [[ "$AWS_PROFILE_STATE_ENABLED" == true ]]; then - test -d $(dirname ${AWS_STATE_FILE}) || exit 1 + test -d $(dirname ${AWS_STATE_FILE}) || return 1 echo "${AWS_PROFILE} ${AWS_REGION}" > "${AWS_STATE_FILE}" fi } function _aws_clear_state() { if [[ "$AWS_PROFILE_STATE_ENABLED" == true ]]; then - test -d $(dirname ${AWS_STATE_FILE}) || exit 1 + test -d $(dirname ${AWS_STATE_FILE}) || return 1 echo -n > "${AWS_STATE_FILE}" fi } diff --git a/plugins/deno/README.md b/plugins/deno/README.md index 38f9f2033..9399db113 100644 --- a/plugins/deno/README.md +++ b/plugins/deno/README.md @@ -4,17 +4,17 @@ This plugin sets up completion and aliases for [Deno](https://deno.land). ## Aliases -| Alias | Full command | -| ----- | ------------------- | -| db | deno bundle | -| dc | deno compile | -| dca | deno cache | -| dfmt | deno fmt | -| dh | deno help | -| dli | deno lint | -| drn | deno run | -| drA | deno run -A | -| drw | deno run --watch | -| dru | deno run --unstable | -| dts | deno test | -| dup | deno upgrade | +| Alias | Full command | +| ----- | ---------------- | +| dc | deno compile | +| dca | deno cache | +| dck | deno check | +| dfmt | deno fmt | +| dh | deno help | +| dli | deno lint | +| drn | deno run | +| drA | deno run -A | +| drw | deno run --watch | +| dsv | deno serve | +| dts | deno test | +| dup | deno upgrade | diff --git a/plugins/deno/deno.plugin.zsh b/plugins/deno/deno.plugin.zsh index bf97d6f03..91fd1618e 100644 --- a/plugins/deno/deno.plugin.zsh +++ b/plugins/deno/deno.plugin.zsh @@ -1,14 +1,14 @@ # ALIASES -alias db='deno bundle' alias dc='deno compile' alias dca='deno cache' +alias dck='deno check' alias dfmt='deno fmt' alias dh='deno help' alias dli='deno lint' alias drn='deno run' alias drA='deno run -A' alias drw='deno run --watch' -alias dru='deno run --unstable' +alias dsv='deno serve' alias dts='deno test' alias dup='deno upgrade' diff --git a/plugins/dnf/README.md b/plugins/dnf/README.md index 1ae68035c..abd51a04a 100644 --- a/plugins/dnf/README.md +++ b/plugins/dnf/README.md @@ -15,18 +15,19 @@ of `dnf5` and uses it as drop-in alternative to the slower `dnf`. ## Aliases -| Alias | Command | Description | -|-------|-------------------------|--------------------------| -| dnfl | `dnf list` | List packages | -| dnfli | `dnf list --installed` | List installed packages | -| dnfgl | `dnf grouplist` | List package groups | -| dnfmc | `dnf makecache` | Generate metadata cache | -| dnfp | `dnf info` | Show package information | -| dnfs | `dnf search` | Search package | -| **Use `sudo`** | -| dnfu | `sudo dnf upgrade` | Upgrade package | -| dnfi | `sudo dnf install` | Install package | -| dnfgi | `sudo dnf groupinstall` | Install package group | -| dnfr | `sudo dnf remove` | Remove package | -| dnfgr | `sudo dnf groupremove` | Remove package group | -| dnfc | `sudo dnf clean all` | Clean cache | +| Alias | Command | Description | +|-------|-------------------------------|------------------------------------------| +| dnfl | `dnf list` | List packages | +| dnfli | `dnf list --installed` | List installed packages | +| dnfgl | `dnf grouplist` | List package groups | +| dnfmc | `dnf makecache` | Generate metadata cache | +| dnfp | `dnf info` | Show package information | +| dnfs | `dnf search` | Search package | +| **Use `sudo`** | +| dnfu | `sudo dnf upgrade` | Upgrade package | +| dnfur | `sudo dnf upgrade --refresh` | Upgrade package (force metadata refresh) | +| dnfi | `sudo dnf install` | Install package | +| dnfgi | `sudo dnf groupinstall` | Install package group | +| dnfr | `sudo dnf remove` | Remove package | +| dnfgr | `sudo dnf groupremove` | Remove package group | +| dnfc | `sudo dnf clean all` | Clean cache | diff --git a/plugins/dnf/dnf.plugin.zsh b/plugins/dnf/dnf.plugin.zsh index 34d5e975b..1726cc0bb 100644 --- a/plugins/dnf/dnf.plugin.zsh +++ b/plugins/dnf/dnf.plugin.zsh @@ -11,6 +11,7 @@ alias dnfp="${dnfprog} info" # Show package information alias dnfs="${dnfprog} search" # Search package alias dnfu="sudo ${dnfprog} upgrade" # Upgrade package +alias dnfur="sudo ${dnfprog} upgrade --refresh" # Upgrade package and refresh repos alias dnfi="sudo ${dnfprog} install" # Install package alias dnfr="sudo ${dnfprog} remove" # Remove package alias dnfc="sudo ${dnfprog} clean all" # Clean cache diff --git a/plugins/history-substring-search/README.md b/plugins/history-substring-search/README.md index 49bed5255..642339bda 100644 --- a/plugins/history-substring-search/README.md +++ b/plugins/history-substring-search/README.md @@ -20,7 +20,7 @@ Requirements Install ------------------------------------------------------------------------------ -Using the [Homebrew]( https://brew.sh ) package manager: +Using the [Homebrew](https://brew.sh) package manager: brew install zsh-history-substring-search echo 'source $(brew --prefix)/share/zsh-history-substring-search/zsh-history-substring-search.zsh' >> ~/.zshrc diff --git a/plugins/macports/macports.plugin.zsh b/plugins/macports/macports.plugin.zsh index d438057f9..9b2abf466 100644 --- a/plugins/macports/macports.plugin.zsh +++ b/plugins/macports/macports.plugin.zsh @@ -8,7 +8,7 @@ alias puo="sudo port upgrade outdated" alias pup="sudo port selfupdate && sudo port upgrade outdated" port-livecheck-maintainer() { - (( ${+commands[port]} == 0 )) || { + (( ${+commands[port]} )) || { print -- "port: not found" >&2 return 1 } diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh index 85208cfc9..2704fb05e 100644 --- a/plugins/vi-mode/vi-mode.plugin.zsh +++ b/plugins/vi-mode/vi-mode.plugin.zsh @@ -26,7 +26,7 @@ typeset -g VI_MODE_CURSOR_OPPEND=${VI_MODE_CURSOR_OPPEND:=0} typeset -g VI_KEYMAP=${VI_KEYMAP:=main} function _vi-mode-set-cursor-shape-for-keymap() { - [[ "$VI_MODE_SET_CURSOR" = true ]] || return + [[ "$VI_MODE_SET_CURSOR" = true ]] || return 0 # https://vt100.net/docs/vt510-rm/DECSCUSR local _shape=0 diff --git a/plugins/web-search/README.md b/plugins/web-search/README.md index 8d74a08c0..ead2c19d7 100644 --- a/plugins/web-search/README.md +++ b/plugins/web-search/README.md @@ -53,7 +53,7 @@ Available search contexts are: | `gopkg` | `https://pkg.go.dev/search?m=package&q=` | | `chatgpt` | `https://chatgpt.com/?q=` | | `claudeai` | `https://claude.ai/new?q=` | -| `grok` | `https://grok.com/?q=` | +| `grokcom` | `https://grok.com/?q=` | | `reddit` | `https://www.reddit.com/search/?q=` | | `ppai` | `https://www.perplexity.ai/search/new?q=` | | `rscrate` | `https://crates.io/search?q=` | diff --git a/plugins/web-search/web-search.plugin.zsh b/plugins/web-search/web-search.plugin.zsh index 93237f4e2..b002e5678 100644 --- a/plugins/web-search/web-search.plugin.zsh +++ b/plugins/web-search/web-search.plugin.zsh @@ -93,7 +93,7 @@ alias npmpkg='web_search npmpkg' alias packagist='web_search packagist' alias gopkg='web_search gopkg' alias chatgpt='web_search chatgpt' -alias grok='web_search grok' +alias grokcom='web_search grok' alias claudeai='web_search claudeai' alias reddit='web_search reddit' alias ppai='web_search ppai' diff --git a/tools/install.sh b/tools/install.sh index d907b795c..5234c17a4 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -473,7 +473,7 @@ EOF # be prompted for the password either way, so this shouldn't cause any issues. # if user_can_sudo; then - sudo -k >/dev/null 2>&1 # -k forces the password prompt + sudo -k >/dev/null 2>&1 || true # -k forces the password prompt when supported sudo chsh -s "$zsh" "$USER" else chsh -s "$zsh" "$USER" # run chsh normally