From 6cb98eda151253e7f11678abef7f0e7b5c96f12d Mon Sep 17 00:00:00 2001 From: Adriaan Knapen Date: Thu, 11 Jul 2019 21:42:28 +0300 Subject: [PATCH 1/4] git: add missing grev alias to README (#7984) --- plugins/git/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/git/README.md b/plugins/git/README.md index d66ad234d..fc89b27e0 100644 --- a/plugins/git/README.md +++ b/plugins/git/README.md @@ -123,6 +123,7 @@ plugins=(... git) | grbi | git rebase -i | | grbm | git rebase master | | grbs | git rebase --skip | +| grev | git revert | | grh | git reset | | grhh | git reset --hard | | groh | git reset origin/$(git_current_branch) --hard | From 29fb617e6b6b18fc7bdfef74fc57bbdf0e2fe52b Mon Sep 17 00:00:00 2001 From: Mark Coleman Date: Fri, 12 Jul 2019 13:16:00 +0100 Subject: [PATCH 2/4] readme: document oneliner unattended installation command (#7983) The original suggestion for an unattended install downloads the installation script to a file, then runs that file with the --unattended argument. The install.sh file would be left behind after the suggested command was run. This change passes the --unattended argument directly into sh. So, it's a nice one-liner like the default installation script, and it doesn't leave a dangling install.sh script. --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 43dcdd3a2..78a5b56bd 100644 --- a/README.md +++ b/README.md @@ -159,8 +159,7 @@ flag `--unattended` to the `install.sh` script. This will have the effect of not the default shell, and also won't run `zsh` when the installation has finished. ```shell -curl -Lo install.sh https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh -sh install.sh --unattended +sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" "" --unattended ``` #### Installing from a forked repository From 17f4cfca99398cb5511557b8515a17bf1bf2948a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Sat, 13 Jul 2019 12:48:10 +0200 Subject: [PATCH 3/4] af-magic: make separator window-size-aware (#7739) --- themes/af-magic.zsh-theme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme index 1c6d1732c..2a6595a71 100644 --- a/themes/af-magic.zsh-theme +++ b/themes/af-magic.zsh-theme @@ -6,7 +6,7 @@ if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" # primary prompt -PROMPT='$FG[237]------------------------------------------------------------%{$reset_color%} +PROMPT='$FG[237]${(l.COLUMNS..-.)}%{$reset_color%} $FG[032]%~\ $(git_prompt_info) \ $FG[105]%(!.#.»)%{$reset_color%} ' From 508cba2fc2ec545504abcf38ecdd958f3a89e5e8 Mon Sep 17 00:00:00 2001 From: PLANET ARGON Date: Mon, 22 Jul 2019 07:28:33 -0700 Subject: [PATCH 4/4] Removing plugin that was named after an external tool, which carries a history as a racist phrase. Was reported by a user of OMZ who shared some background on the terminology and how it made them feel. (#8027) --- plugins/bwana/README.md | 12 ------------ plugins/bwana/bwana.plugin.zsh | 13 ------------- 2 files changed, 25 deletions(-) delete mode 100644 plugins/bwana/README.md delete mode 100644 plugins/bwana/bwana.plugin.zsh diff --git a/plugins/bwana/README.md b/plugins/bwana/README.md deleted file mode 100644 index dd4fe9f9c..000000000 --- a/plugins/bwana/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# Bwana - -This plugin provides a function to open `man` pages directly with [Bwana](https://www.bruji.com/bwana/). - -To use it add bwana to the plugins array in your zshrc file. - -```bash -plugins=(... bwana) -``` - -The `bwana` function opens the man page of the passed argument in the Bwana app. -For example: `bwana ln` opens the man page for `ln` in Bwana. diff --git a/plugins/bwana/bwana.plugin.zsh b/plugins/bwana/bwana.plugin.zsh deleted file mode 100644 index 71c9eb18d..000000000 --- a/plugins/bwana/bwana.plugin.zsh +++ /dev/null @@ -1,13 +0,0 @@ -# -# Requires https://www.bruji.com/bwana/ -# -if [[ -e /Applications/Bwana.app ]] || - ( system_profiler -detailLevel mini SPApplicationsDataType | grep -q Bwana ) -then - function bwana() { - open "man:$1" - } -else - echo "Bwana lets you read man files in Safari through a man: URI scheme" - echo "To use it within Zsh, install it from https://www.bruji.com/bwana/" -fi