Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Oh My Zsh project URL #718

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.mkd
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ there was any progress made. So, I'm trying to start this off with Antigen,
hoping to better this situation. Please note that I'm by no means a zsh or any
shell script expert (far from it).

[1]: https://github.com/robbyrussell/oh-my-zsh/issues/465
[2]: https://github.com/robbyrussell/oh-my-zsh/issues/377
[3]: https://github.com/robbyrussell/oh-my-zsh/issues/1014
[1]: https://github.com/ohmyzsh/ohmyzsh/issues/465
[2]: https://github.com/ohmyzsh/ohmyzsh/issues/377
[3]: https://github.com/ohmyzsh/ohmyzsh/issues/1014

Inspired by vundle, Antigen can pull oh-my-zsh style plugins from various github
repositories. You are not limited to use plugins from the oh-my-zsh repository
Expand Down Expand Up @@ -130,7 +130,7 @@ you may find useful.
[Vundle]: https://github.com/gmarik/vundle
[awesome-zsh-plugins]: https://github.com/unixorn/awesome-zsh-plugins
[wild]: https://github.com/zsh-users/antigen/wiki/In-the-wild
[oh-my-zsh]: https://github.com/robbyrussell/oh-my-zsh
[oh-my-zsh]: https://github.com/ohmyzsh/ohmyzsh
[issue]: https://github.com/zsh-users/antigen/issues
[license]: http://mit.sharats.me
[contributing]: https://github.com/zsh-users/antigen/wiki/Contributing
Expand Down
6 changes: 3 additions & 3 deletions bin/antigen.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ antigen () {
# Returns
# List of themes by name
-antigen-get-themes () {
local library='robbyrussell/oh-my-zsh'
local library='ohmyzsh/ohmyzsh'
local bundle=$(-antigen-find-bundle $library)

if [[ -n "$bundle" ]]; then
Expand Down Expand Up @@ -433,7 +433,7 @@ antigen () {

# Pre-startup initializations.
-antigen-set-default ANTIGEN_OMZ_REPO_URL \
https://github.com/robbyrussell/oh-my-zsh.git
https://github.com/ohmyzsh/ohmyzsh.git
-antigen-set-default ANTIGEN_PREZTO_REPO_URL \
https://github.com/sorin-ionescu/prezto.git
-antigen-set-default ANTIGEN_DEFAULT_REPO_URL $ANTIGEN_OMZ_REPO_URL
Expand Down Expand Up @@ -1402,7 +1402,7 @@ antigen-use () {
antigen-version () {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have a question. I'm not sure to understand the whole solution and its deployment mechanisms. But shouldn't this function be deleted as it seems redundant with the one in src/commands/version.zsh

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure; I'd prefer to keep it for now and remove it in a separate PR (since I too don't really understand how it's relevant).

local extensions

printf "Antigen %s (%s)\nRevision date: %s\n" "develop" "d1dd78b" "2018-01-15 14:37:21 -0300"
printf "Antigen %s (%s)\nRevision date: %s\n" "develop" "db1c073" "2020-10-26 22:08:29 +0100"

# Show extension information if any is available
if (( $+functions[antigen-ext] )); then
Expand Down
2 changes: 1 addition & 1 deletion src/helpers/get-themes.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Returns
# List of themes by name
-antigen-get-themes () {
local library='robbyrussell/oh-my-zsh'
local library='ohmyzsh/ohmyzsh'
local bundle=$(-antigen-find-bundle $library)

if [[ -n "$bundle" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion src/lib/env-setup.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

# Pre-startup initializations.
-antigen-set-default ANTIGEN_OMZ_REPO_URL \
https://github.com/robbyrussell/oh-my-zsh.git
https://github.com/ohmyzsh/ohmyzsh.git
-antigen-set-default ANTIGEN_PREZTO_REPO_URL \
https://github.com/sorin-ionescu/prezto.git
-antigen-set-default ANTIGEN_DEFAULT_REPO_URL $ANTIGEN_OMZ_REPO_URL
Expand Down
4 changes: 2 additions & 2 deletions tests/clone-dir.t
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ There may be a dot-git suffix in branches names.
You may use a plugin from a library on an specific tag/branch.

$ antigen bundle [email protected]
Installing robbyrussell/oh-my-zsh@v1.2.3-1...
git clone .* --branch v1.2.3-1 -- https://github.com/robbyrussell/oh-my-zsh.git .*/bundles/robbyrussell/oh-my-zsh-v1.2.3-1 (re)
Installing ohmyzsh/ohmyzsh@v1.2.3-1...
git clone .* --branch v1.2.3-1 -- https://github.com/ohmyzsh/ohmyzsh.git .*/bundles/ohmyzsh/ohmyzsh-v1.2.3-1 (re)

Done. Took *s. (glob)

Expand Down
4 changes: 2 additions & 2 deletions tests/use.t
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ Test load from oh-my-zsh:
$ antigen bundle other/plugin
$ antigen apply
$ antigen list --long
https://github.com/robbyrussell/oh-my-zsh.git lib plugin true
https://github.com/robbyrussell/oh-my-zsh.git plugins/wd plugin true
https://github.com/ohmyzsh/ohmyzsh.git lib plugin true
https://github.com/ohmyzsh/ohmyzsh.git plugins/wd plugin true
https://github.com/other/plugin.git / plugin true

Test load from prezto:
Expand Down