Merge 2119568d86 into f84341c574

Add unar as a fallback when unrar is not available for extracting
RAR files. This addresses the issue where unrar has been removed
from Homebrew due to licensing issues.

The extraction now:
- Prefers unrar if available (backward compatible)
- Falls back to unar if unrar is not found
- Shows helpful error message if neither tool is installed

lib/git.zsh

@@ -117,7 +117,7 @@ function _omz_git_prompt_status() {
   fi
 
   # For each status prefix, do a regex comparison
-  for status_prefix in ${(k)prefix_constant_map}; do
+  for status_prefix in "${(@k)prefix_constant_map}"; do
     local status_constant="${prefix_constant_map[$status_prefix]}"
     local status_regex=$'(^|\n)'"$status_prefix"
 

plugins/extract/extract.plugin.zsh

@@ -77,7 +77,15 @@ EOF
       (*.lzma) unlzma "$full_path" ;;
       (*.z) uncompress "$full_path" ;;
       (*.zip|*.war|*.jar|*.ear|*.sublime-package|*.ipa|*.ipsw|*.xpi|*.apk|*.aar|*.whl|*.vsix|*.crx|*.pk3|*.pk4) unzip "$full_path" ;;
-      (*.rar) unrar x -ad "$full_path" ;;
+      (*.rar)
+        if (( $+commands[unrar] )); then
+          unrar x -ad "$full_path"
+        elif (( $+commands[unar] )); then
+          unar -o . "$full_path"
+        else
+          echo "extract: cannot extract RAR files: install unrar or unar" >&2
+          success=1
+        fi ;;
       (*.rpm)
         rpm2cpio "$full_path" | cpio --quiet -id ;;
       (*.7z | *.7z.[0-9]* | *.pk7) 7za x "$full_path" ;;

plugins/magento2/README.md

@@ -0,0 +1,73 @@
+```markdown
+# Magento 2
+
+This plugin adds aliases for Magento2 commands.
+
+```bash
+plugins=(... magento2)
+```
+
+| Alias    | Description                                          |
+|:-:|:-:|
+| `magento`| `bin/magento`                                       |
+| `mup`   | `bin/magento setup:upgrade`                         |
+| `mdeploy`   | `bin/magento setup:static-content:deploy -f`        |
+| `mdi`   | `bin/magento setup:di:compile`                      |
+
+## Database
+
+| Alias      | Description                       |
+|:-:|:-:|
+| `mreindex` | `bin/magento indexer:reindex`     |
+| `minf`     | `bin/magento indexer:info`        |
+| `mid`      | `bin/magento indexer:disable`     |
+| `mien`     | `bin/magento indexer:enable`      |
+
+## Maintenance
+
+| Alias | Description                       |
+|:-:|:-:|
+| `mmt` | `bin/magento maintenance:enable`  |
+| `mmf` | `bin/magento maintenance:disable` |
+
+## Clears
+
+| Alias   | Description                                          |
+|:-:|:-:|
+| `mcc`   | `bin/magento cache:clean`                           |
+| `mcf`   | `bin/magento cache:flush`                           |
+| `mtcc`  | `bin/magento cache:clean`                           |
+| `mtcf`  | `bin/magento cache:flush`                           |
+| `mtccf` | `bin/magento cache:flush && bin/magento cache:clean` |
+
+## Admin
+
+| Alias | Description                        |
+|:-:|:-:|
+| `mac` | `bin/magento bin\magento a:u:c` |
+| `mau` | `bin/magento bin\magento a:u:u` |
+| `maurl` | `bin/magento bin\magento i:a` |
+
+## Queues
+
+| Alias | Description                           |
+|:-:|:-:|
+| `mqs` | `bin/magento queue:consumers:start`   |
+
+## Logs
+
+| Alias    | Description                                                                                           |
+|:-:|:-:|
+| `mlog`| `tail -f var/log/*.log` |
+| `mslog`| `tail -f var/log/system.log` |
+| `melog`| `tail -f var/log/exeption.log` |
+
+## Development
+
+| Alias   | Description                                          |
+|:-:|:-:|
+| `mms`   | `'bin\magento module:status`                           |
+| `mme`   | `'bin\magento module:enable`                           |
+| `mmd`   | `'bin\magento module:disable`                           |
+
+```

plugins/magento2/magento2.plugin.zsh

@@ -0,0 +1,47 @@
+#!zsh
+alias magento='bin/magento'
+
+# Setup
+alias mup='bin/magento setup:upgrade'
+alias mdeploy='bin/magento setup:static-content:deploy -f'
+alias mdi='bin/magento setup:di:compile'
+
+# Cache
+alias mcc='bin/magento cache:clean'
+alias mcf='bin/magento cache:flush'
+alias mccf='bin/magento cache:flush && bin/magento cache:clean'
+
+# Database
+alias mreindex='bin/magento indexer:reindex'
+alias minf='bin/magento indexer:info'
+alias mid='bin/magento indexer:disable'
+alias mien='bin/magento indexer:enable'
+
+# Maintenance
+alias mmt='bin/magento maintenance:enable'
+alias mmf='bin/magento maintenance:disable'
+
+# Admin
+alias mrp='bin/magento admin:reset-password'
+
+# Queue
+alias mqs='bin/magento queue:consumers:start'
+
+# Logs
+alias mlog='tail -f var/log/*.log'
+alias mslog='tail -f var/log/system.log'
+alias melog='tail -f var/log/exeption.log'
+
+# Custom
+alias mperm='chmod -R 777 var pub generated vendor app/etc'
+alias mmode='bin/magento deploy:mode:show'
+alias mmset='bin/magento deploy:mode:set'
+
+# Deployment
+alias mms='bin\magento module:status'
+alias mme='bin\magento module:enable'
+alias mmd='bin\magento module:disable'
+alias ml='bin\magento list'
+alias mac='bin\magento a:u:c'
+alias mau='bin\magento a:u:u'
+alias maurl='bin/magento i:a'

plugins/uv/README.md

@@ -1,6 +1,7 @@
 # uv plugin
 
-This plugin automatically installs [uv](https://github.com/astral-sh/uv)'s completions for you, and keeps them up to date. It also adds convenient aliases for common usage.
+This plugin automatically installs [uv](https://github.com/astral-sh/uv)'s completions for you,
+and keeps them up to date. It also adds convenient aliases for common usage.
 
 To use it, add `uv` to the plugins array in your zshrc file:
 
@@ -10,20 +11,26 @@ plugins=(... uv)
 
 ## Aliases
 
-| Alias | Command                                                                 | Description                                                          |
+| Alias | Command                                                                                  | Description                                                           |
-|:----- |------------------------------------------------------------------------ |:-------------------------------------------------------------------- |
+| :---- | ---------------------------------------------------------------------------------------- | :-------------------------------------------------------------------- |
-| uva   | `uv add`                                                                | Add packages to the project                                          |
+| uva   | `uv add`                                                                                 | Add packages to the project                                           |
-| uvexp | `uv export --format requirements-txt --no-hashes --output-file requirements.txt --quiet` | Export the lock file to `requirements.txt`          |
+| uvexp | `uv export --format requirements-txt --no-hashes --output-file requirements.txt --quiet` | Export the lock file to `requirements.txt`                            |
-| uvl   | `uv lock`                                                               | Lock the dependencies                                                |
+| uvi   | `uv init`                                                                                | Initialize a new project in current workspace and environment.        |
-| uvlr  | `uv lock --refresh`                                                     | Rebuild the lock file without upgrading dependencies                 |
+| uvinw | `uv init --no-workspace`                                                                 | Initialize a new project in a new workspace and environment           |
-| uvlu  | `uv lock --upgrade`                                                     | Lock the dependencies to the newest compatible versions              |
+| uvl   | `uv lock`                                                                                | Lock the dependencies                                                 |
-| uvp   | `uv pip`                                                                | Manage pip packages                                                  |
+| uvlr  | `uv lock --refresh`                                                                      | Rebuild the lock file without upgrading dependencies                  |
-| uvpy  | `uv python`                                                             | Manage Python installs                                               |
+| uvlu  | `uv lock --upgrade`                                                                      | Lock the dependencies to the newest compatible versions               |
-| uvpp  | `uv python pin`                                                         | Pin the current project to use a specific Python version             |
+| uvp   | `uv pip`                                                                                 | Manage pip packages                                                   |
-| uvr   | `uv run`                                                                | Run commands within the project's environment                        |
+| uvpi  | `uv python install`                                                                      | Install a specific version of python                                  |
-| uvrm  | `uv remove`                                                             | Remove packages from the project                                     |
+| uvpl  | `uv python list`                                                                         | Lists all python version installed                                    |
-| uvs   | `uv sync`                                                               | Sync the environment with the lock file                              |
+| uvpp  | `uv python pin`                                                                          | Pin the current project to use a specific Python version              |
-| uvsr  | `uv sync --refresh`                                                     | "Force" sync the environment with the lock file (ignore cache)       |
+| uvpu  | `uv python uninstall`                                                                    | Remove a specific version of python                                   |
-| uvsu  | `uv sync --upgrade`                                                     | Sync the environment, allowing upgrades and ignoring the lock file   |
+| uvpy  | `uv python`                                                                              | Manage Python installs                                                |
-| uvup  | `uv self update`                                                        | Update the UV tool to the latest version                             |
+| uvr   | `uv run`                                                                                 | Run commands within the project's environment                         |
-| uvv   | `uv venv`                                                               | Manage virtual environments                                          |
+| uvrm  | `uv remove`                                                                              | Remove packages from the project                                      |
+| uvs   | `uv sync`                                                                                | Sync the environment with the lock file                               |
+| uvsr  | `uv sync --refresh`                                                                      | "Force" sync the environment with the lock file (ignore cache)        |
+| uvsu  | `uv sync --upgrade`                                                                      | Sync the environment, allowing upgrades and ignoring the lock file    |
+| uvtr  | `uv tree`                                                                                | Displays the full dependency tree for the current project environment |
+| uvup  | `uv self update`                                                                         | Update the UV tool to the latest version                              |
+| uvv   | `uv venv`                                                                                | Manage virtual environments                                           |

plugins/uv/uv.plugin.zsh

@@ -7,10 +7,15 @@ alias uv="noglob uv"
 
 alias uva='uv add'
 alias uvexp='uv export --format requirements-txt --no-hashes --output-file requirements.txt --quiet'
+alias uvi='uv init'
+alias uvinw='uv init --no-workspace'
 alias uvl='uv lock'
 alias uvlr='uv lock --refresh'
 alias uvlu='uv lock --upgrade'
 alias uvp='uv pip'
+alias uvpi='uv python install'
+alias uvpl='uv python list'
+alias uvpu='uv python uninstall'
 alias uvpy='uv python'
 alias uvpp='uv python pin'
 alias uvr='uv run'
@@ -18,6 +23,7 @@ alias uvrm='uv remove'
 alias uvs='uv sync'
 alias uvsr='uv sync --refresh'
 alias uvsu='uv sync --upgrade'
+alias uvtr='uv tree'
 alias uvup='uv self update'
 alias uvv='uv venv'