Skip to content

Commit

Permalink
Catch up (#1)
Browse files Browse the repository at this point in the history
* feat(z): update to dd94ef04 (ohmyzsh#12862)

Co-authored-by: ohmyzsh[bot] <54982679+ohmyzsh[bot]@users.noreply.github.com>

* chore(deps): bump urllib3 from 2.2.3 to 2.3.0 in /.github/workflows/dependencies (ohmyzsh#12863)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump charset-normalizer in /.github/workflows/dependencies (ohmyzsh#12874)

Bumps [charset-normalizer](https://github.com/jawah/charset_normalizer) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/jawah/charset_normalizer/releases)
- [Changelog](https://github.com/jawah/charset_normalizer/blob/master/CHANGELOG.md)
- [Commits](jawah/charset_normalizer@3.4.0...3.4.1)

---
updated-dependencies:
- dependency-name: charset-normalizer
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix(af-magic): add logic for virtualenv separator (ohmyzsh#12875)

* feat(web-search): add perplexity.ai (ohmyzsh#12815)

* fix(cli): ensure `ksharrays` is unset

Closes ohmyzsh#12900

* fix(rust): call `rustc` through `rustup run` (ohmyzsh#12901)

* fix(grc): add linuxbrew path (ohmyzsh#12903)

* feat(eza): add color-scale options (ohmyzsh#12841)

* fix(sonicradish): reset color typo (ohmyzsh#12912)

* ci(deps): update `gitfast` to its new structure (ohmyzsh#12922)

Co-authored-by: Carlo Sala <carlosalag@protonmail.com>

* feat(gitfast): update to version v2.2 (ohmyzsh#12923)

Co-authored-by: ohmyzsh[bot] <54982679+ohmyzsh[bot]@users.noreply.github.com>

* chore(deps): bump semver in /.github/workflows/dependencies (ohmyzsh#12924)

Bumps [semver](https://github.com/python-semver/python-semver) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/python-semver/python-semver/releases)
- [Changelog](https://github.com/python-semver/python-semver/blob/master/CHANGELOG.rst)
- [Commits](python-semver/python-semver@3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feat(python): support multiple venvs via `$PYTHON_VENV_NAMES` (ohmyzsh#12932)

* fix(tailscale): fix completion binding for alias to `Tailscale` (ohmyzsh#12928)

Fixes ohmyzsh#12928

* feat(perl): add `perlbrew` auto activation (ohmyzsh#12814)

Co-authored-by: Carlo Sala <carlosalag@protonmail.com>

* docs(chucknorris): add useful note (ohmyzsh#12822)

* fix(direnv): warn user if command not found (ohmyzsh#12840)

Co-authored-by: Carlo Sala <carlosalag@protonmail.com>

* fix(changelog): show if there are no changes (ohmyzsh#12934)

* feat(foot): add foot plugin (ohmyzsh#12849)

* fix(timer): minutes calculation logic (ohmyzsh#12857)

* fix(cli)!: remove harmful `--unattended` flag for `omz update` (ohmyzsh#12935)

Co-authored-by: Carlo Sala <carlosalag@protonmail.com>

* feat(jira): allow branch name customization (ohmyzsh#12850)

Co-authored-by: Carlo Sala <carlosalag@protonmail.com>

* chore: ignore `.zwc` files (ohmyzsh#12936)

* docs(git-auto-fetch): fix typo (ohmyzsh#12937)

* chore(deps): bump semver from 3.0.3 to 3.0.4 in /.github/workflows/dependencies (ohmyzsh#12938)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feat(dnf): add `dnf5` completion

Closes ohmyzsh#12939

* docs(ember-cli): fix typo (ohmyzsh#12945)

* feat(terraform): support `TF_DATA_DIR` in `tf_prompt_info` (ohmyzsh#12949)

* feat(wd): update to v0.9.3 (ohmyzsh#12954)

Co-authored-by: ohmyzsh[bot] <54982679+ohmyzsh[bot]@users.noreply.github.com>

* chore(deps): bump certifi in /.github/workflows/dependencies (ohmyzsh#12955)

Bumps [certifi](https://github.com/certifi/python-certifi) from 2024.12.14 to 2025.1.31.
- [Commits](certifi/python-certifi@2024.12.14...2025.01.31)

---
updated-dependencies:
- dependency-name: certifi
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix(mvn): handle directories in `<relativePath>` (ohmyzsh#12957)

* feat(asdf): support asdf v0.16 ahead

Co-authored-by: Valgard Trontheim <github@trontheim.de>

Closes ohmyzsh#12964
Closes ohmyzsh#12967

* fix(chruby): update brew sourcing for Apple Silicon (ohmyzsh#12941)

Co-authored-by: Carlo Sala <carlosalag@protonmail.com>

* feat(agnoster): add color config and add some git stuff (ohmyzsh#12505)

Co-authored-by: Kilobyte22 <stiepen22@gmx.de>
Co-authored-by: Carlo Sala <carlosalag@protonmail.com>

* fix(updater): detect p10k instant prompt (ohmyzsh#12971)

Fixes ohmyzsh#12781

* fix(agnoster): print white text over black (ohmyzsh#12525)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: ohmyzsh[bot] <54982679+ohmyzsh[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Kalle Ahlström <71292737+kahlstrm@users.noreply.github.com>
Co-authored-by: Bhanu <pvbhanuteja@gmail.com>
Co-authored-by: Carlo Sala <carlosalag@protonmail.com>
Co-authored-by: Thomas <thomas@wache.fr>
Co-authored-by: Michele Bologna <github@michelebologna.net>
Co-authored-by: Nico Just <nicojust@users.noreply.github.com>
Co-authored-by: Abhijeet Vashistha <abhivashistha5@gmail.com>
Co-authored-by: Felipe Contreras <felipe.contreras@gmail.com>
Co-authored-by: Marc Cornellà <marc@mcornella.com>
Co-authored-by: jamesrtnz <jamesrt@gmail.com>
Co-authored-by: Keith Bennett <keithrbennett@gmail.com>
Co-authored-by: Thomas Boyer <warbeaver@pm.me>
Co-authored-by: fossdd <fossdd@pwned.life>
Co-authored-by: shun095 <8069181+shun095@users.noreply.github.com>
Co-authored-by: Ken van der Eerden <15888558+Ken-vdE@users.noreply.github.com>
Co-authored-by: Eduardo Roberto <euamotubaina@gmail.com>
Co-authored-by: Marcus Voltolim <9442331+marcusvoltolim@users.noreply.github.com>
Co-authored-by: Guspan Tanadi <36249910+guspan-tanadi@users.noreply.github.com>
Co-authored-by: soemiran <erwan.miran@saas-office.com>
Co-authored-by: Daniel Mensinger <daniel@mensinger-ka.de>
Co-authored-by: Dennis Dashkevich <dskecse@gmail.com>
Co-authored-by: Stephen Gelman <ssgelm@gmail.com>
Co-authored-by: Kilobyte22 <stiepen22@gmx.de>
Co-authored-by: Adrien Plazas <kekun.plazas@laposte.net>
  • Loading branch information
1 parent b9e73b4 commit 60b5633
Show file tree
Hide file tree
Showing 42 changed files with 1,129 additions and 154 deletions.
12 changes: 7 additions & 5 deletions .github/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@ dependencies:
plugins/gitfast:
repo: felipec/git-completion
branch: master
version: tag:v2.1
version: tag:v2.2
postcopy: |
set -e
rm -rf git-completion.plugin.zsh Makefile README.adoc t tools
test -e git-completion.zsh && mv -f git-completion.zsh _git
rm -rf git-completion.plugin.zsh Makefile t tools
mv README.adoc MANUAL.adoc
mv -f src/* .
rmdir src
plugins/gradle:
repo: gradle/gradle-completion
branch: master
Expand All @@ -28,15 +30,15 @@ dependencies:
plugins/wd:
repo: mfaerevaag/wd
branch: master
version: tag:v0.9.2
version: tag:v0.9.3
precopy: |
set -e
rm -r test
rm install.sh tty.gif wd.1
plugins/z:
branch: master
repo: agkozak/zsh-z
version: afaf2965b41fdc6ca66066e09382726aa0b6aa04
version: dd94ef04acc41748ba171eb219971cb455e0040b
precopy: |
set -e
test -e README.md && mv -f README.md MANUAL.md
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/dependencies/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
certifi==2024.12.14
charset-normalizer==3.4.0
certifi==2025.1.31
charset-normalizer==3.4.1
idna==3.10
PyYAML==6.0.2
requests==2.32.3
semver==3.0.2
urllib3==2.2.3
semver==3.0.4
urllib3==2.3.0
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ log/
# editor configs
.vscode
.idea

# zcompile cached files
*.zwc
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,17 @@ wait a week?) you just need to run:
omz update
```

> [!NOTE]
> If you want to automate this process in a script, you should call directly the `upgrade` script, like this:
>
> ```sh
> $ZSH/tools/upgrade.sh
> ```
>
> See more options in the [FAQ: How do I update Oh My Zsh?](https://github.com/ohmyzsh/ohmyzsh/wiki/FAQ#how-do-i-update-oh-my-zsh).
>
> **USE OF `omz update --unattended` HAS BEEN REMOVED, AS IT HAS SIDE EFFECTS**.
Magic! 🎉
## Uninstalling Oh My Zsh
Expand Down
16 changes: 10 additions & 6 deletions lib/cli.zsh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env zsh

function omz {
setopt localoptions noksharrays
[[ $# -gt 0 ]] || {
_omz::help
return 1
Expand Down Expand Up @@ -822,6 +823,13 @@ function _omz::update {
return 1
}

# Check if --unattended was passed
[[ "$1" != --unattended ]] || {
_omz::log error "the \`\e[2m--unattended\e[0m\` flag is no longer supported, use the \`\e[2mupgrade.sh\e[0m\` script instead."
_omz::log error "for more information see https://github.com/ohmyzsh/ohmyzsh/wiki/FAQ#how-do-i-update-oh-my-zsh"
return 1
}

local last_commit=$(builtin cd -q "$ZSH"; git rev-parse HEAD 2>/dev/null)
[[ $? -eq 0 ]] || {
_omz::log error "\`$ZSH\` is not a git directory. Aborting..."
Expand All @@ -830,11 +838,7 @@ function _omz::update {

# Run update script
zstyle -s ':omz:update' verbose verbose_mode || verbose_mode=default
if [[ "$1" != --unattended ]]; then
ZSH="$ZSH" command zsh -f "$ZSH/tools/upgrade.sh" -i -v $verbose_mode || return $?
else
ZSH="$ZSH" command zsh -f "$ZSH/tools/upgrade.sh" -v $verbose_mode || return $?
fi
ZSH="$ZSH" command zsh -f "$ZSH/tools/upgrade.sh" -i -v $verbose_mode || return $?

# Update last updated file
zmodload zsh/datetime
Expand All @@ -843,7 +847,7 @@ function _omz::update {
command rm -rf "$ZSH/log/update.lock"

# Restart the zsh session if there were changes
if [[ "$1" != --unattended && "$(builtin cd -q "$ZSH"; git rev-parse HEAD)" != "$last_commit" ]]; then
if [[ "$(builtin cd -q "$ZSH"; git rev-parse HEAD)" != "$last_commit" ]]; then
# Old zsh versions don't have ZSH_ARGZERO
local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}"
# Check whether to run a login shell
Expand Down
18 changes: 18 additions & 0 deletions plugins/asdf/asdf.plugin.zsh
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
if (( $+commands[asdf] )); then
export ASDF_DATA_DIR="${ASDF_DATA_DIR:-$HOME/.asdf}"
path=("$ASDF_DATA_DIR/shims" $path)

# If the completion file doesn't exist yet, we need to autoload it and
# bind it to `asdf`. Otherwise, compinit will have already done that.
if [[ ! -f "$ZSH_CACHE_DIR/completions/_asdf" ]]; then
typeset -g -A _comps
autoload -Uz _asdf
_comps[asdf]=_asdf
fi
asdf completion zsh >| "$ZSH_CACHE_DIR/completions/_asdf" &|

return
fi

# TODO:(2025-02-12): remove deprecated asdf <0.16 code

# Find where asdf should be installed
ASDF_DIR="${ASDF_DIR:-$HOME/.asdf}"
ASDF_COMPLETIONS="$ASDF_DIR/completions"
Expand Down
2 changes: 2 additions & 0 deletions plugins/chruby/chruby.plugin.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ _source-from-homebrew() {
# check default brew prefix
if [[ -h /usr/local/opt/chruby ]];then
_brew_prefix="/usr/local/opt/chruby"
elif [[ -h /opt/homebrew/opt/chruby ]]; then
_brew_prefix="/opt/homebrew/opt/chruby"
else
# ok , it is not default prefix
# this call to brew is expensive ( about 400 ms ), so at least let's make it only once
Expand Down
7 changes: 7 additions & 0 deletions plugins/chucknorris/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,10 @@ Last login: Fri Jan 30 23:12:26 on ttys001
- `cowsay` if using `chuck_cow`

Available via homebrew, apt, ...

> [!NOTE]
> In addition to installing `fortune`, it may be necessary to run:
>
> `strfile $ZSH/plugins/chucknorris/fortunes/chucknorris\n`
>
> (include the "\n" literally) to write the fortune data to the proper directory.
7 changes: 5 additions & 2 deletions plugins/direnv/direnv.plugin.zsh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Don't continue if direnv is not found
command -v direnv &>/dev/null || return
# If direnv is not found, don't continue and print a warning
if (( ! $+commands[direnv] )); then
echo "Warning: direnv not found. Please install direnv and ensure it's in your PATH before using this plugin."
return
fi

_direnv_hook() {
trap -- '' SIGINT;
Expand Down
Loading

0 comments on commit 60b5633

Please sign in to comment.