mirrors/ohmyzsh-mirror
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-24 01:37:27 +08:00
Code Issues Releases Wiki Activity

Compare commits

base: mirrors:e3b58b9f0206d3918417eb1bf2e4dfd83cd944c3
Branches Tags
mirrors:master
mirrors:update/plugins/kube-ps1/9b41c091
mirrors:update/plugins/history-substring-search/14c8d2e0
...
compare: mirrors:159fa377d9588e4731a43da8e2a6370c8195c318
Branches Tags
mirrors:master
mirrors:update/plugins/kube-ps1/9b41c091
mirrors:update/plugins/history-substring-search/14c8d2e0

3 Commits
e3b58b9f02 ... 159fa377d9

Author SHA1 Message Date
Haltarys
159fa377d9
Merge 0ccd809f6e into 92aed2e936 2025-12-09 21:02:56 +01:00
Tanzim Hossain Romel
92aed2e936
feat(extract): add unar as fallback for RAR extraction (#13472) 
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
 2025-12-09 20:14:31 +01:00
Haltarys
0ccd809f6e fix(plugins/git): change alias gm to gme (conflict with GraphicsMagick) 
`gm` is the name of the GraphicsMagick (http://www.graphicsmagick.org/index.html) command line tool, which conflicts with the `gm` alias in the git plugin. This change renames the alias to `gme` to avoid the conflict.

style(plugins/git): realign column in Readme

fix(plugins/git): realign column in Readme
 2025-08-20 20:27:43 +02:00
3 changed files with 11 additions and 3 deletions
Show Stats Expand all files Collapse all files

10
plugins/extract/extract.plugin.zsh
View File

@ -77,7 +77,15 @@ EOF
(*.lzma) unlzma "$full_path" ;; (*.lzma) unlzma "$full_path" ;;
(*.z) uncompress "$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" ;; (*.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) (*.rpm)
rpm2cpio "$full_path" | cpio --quiet -id ;; rpm2cpio "$full_path" | cpio --quiet -id ;;
(*.7z | *.7z.[0-9]* | *.pk7) 7za x "$full_path" ;; (*.7z | *.7z.[0-9]* | *.pk7) 7za x "$full_path" ;;

2
plugins/git/README.md
View File

@ -112,7 +112,7 @@ plugins=(... git)
| `glgp` | `git log --stat --patch` | | `glgp` | `git log --stat --patch` |
| `gignored` | `git ls-files -v \| grep "^[[:lower:]]"` | | `gignored` | `git ls-files -v \| grep "^[[:lower:]]"` |
| `gfg` | `git ls-files \| grep` | | `gfg` | `git ls-files \| grep` |
| `gm` | `git merge` | | `gme` | `git merge` |
| `gma` | `git merge --abort` | | `gma` | `git merge --abort` |
| `gmc` | `git merge --continue` | | `gmc` | `git merge --continue` |
| `gms` | `git merge --squash` | | `gms` | `git merge --squash` |

2
plugins/git/git.plugin.zsh
View File

@ -263,7 +263,7 @@ alias glg='git log --stat'
alias glgp='git log --stat --patch' alias glgp='git log --stat --patch'
alias gignored='git ls-files -v | grep "^[[:lower:]]"' alias gignored='git ls-files -v | grep "^[[:lower:]]"'
alias gfg='git ls-files | grep' alias gfg='git ls-files | grep'
alias gm='git merge' alias gme='git merge'
alias gma='git merge --abort' alias gma='git merge --abort'
alias gmc='git merge --continue' alias gmc='git merge --continue'
alias gms="git merge --squash" alias gms="git merge --squash"