From ae0e4388b60d9dc454800215d1bf44373d9e9858 Mon Sep 17 00:00:00 2001 From: Bruno Pinto Date: Thu, 3 Sep 2015 19:35:19 +0100 Subject: [PATCH] Back to oh-my-fish organization --- CONTRIBUTING.md | 4 ++-- FAQ.md | 2 +- README.md | 20 ++++++++++---------- bin/install | 10 +++++----- init.fish | 2 +- lib/README.md | 2 +- pkg/omf/cli/omf.submit.fish | 2 +- pkg/omf/omf.fish | 2 +- pkg/omf/templates/pkg/README.md | 4 ++-- pkg/omf/templates/themes/README.md | 4 ++-- 10 files changed, 26 insertions(+), 26 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 458f8d4..8633ec0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,5 +1,5 @@
- +
@@ -22,7 +22,7 @@ Thanks for taking the time to read this guide and please _do_ contribute to Oh M ## Issues -Please [open an issue](https://github.com/fish-shell/omf/issues) for bug reports / patches. Include your OS version, code examples, stack traces and everything you can to help you debug your problem. +Please [open an issue](https://github.com/oh-my-fish/oh-my-fish/issues) for bug reports / patches. Include your OS version, code examples, stack traces and everything you can to help you debug your problem. If you have a new feature or large change in mind, please open a new issue with your suggestion to discuss the idea together. diff --git a/FAQ.md b/FAQ.md index b54d53b..842bfa9 100644 --- a/FAQ.md +++ b/FAQ.md @@ -1,5 +1,5 @@
- +
diff --git a/README.md b/README.md index a400305..0f7e33c 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@

- +

@@ -25,14 +25,14 @@ | Advanced | -Screencasts +Screencasts | Contributing | FAQ

- +

@@ -44,19 +44,19 @@ Oh My Fish is an all-purpose framework for the [fishshell][Fishshell]. It looks after your configuration, themes and packages. It's lightning fast and easy to use. -We love contributions, [fork and send us a PR](https://github.com/fish-shell/oh-my-fish/fork). +We love contributions, [fork and send us a PR](https://github.com/oh-my-fish/oh-my-fish/fork). # Install ```fish -curl -L git.io/omf | sh +curl -L github.com/oh-my-fish/oh-my-fish/raw/master/bin/install | sh omf help ``` Or _download_ and run it yourself: ```fish -curl -L git.io/omf > install +curl -L github.com/oh-my-fish/oh-my-fish/raw/master/bin/install > install chmod +x install ./install ``` @@ -235,13 +235,13 @@ MIT © [Oh My Fish][contributors] :metal: [fishshell]: http://fishshell.com -[contributors]: https://github.com/fish-shell/oh-my-fish/graphs/contributors +[contributors]: https://github.com/oh-my-fish/oh-my-fish/graphs/contributors -[travis-badge]: http://img.shields.io/travis/fish-shell/oh-my-fish.svg?style=flat-square -[travis-url]: https://travis-ci.org/fish-shell/oh-my-fish +[travis-badge]: http://img.shields.io/travis/oh-my-fish/oh-my-fish.svg?style=flat-square +[travis-url]: https://travis-ci.org/oh-my-fish/oh-my-fish [fish-badge]: https://img.shields.io/badge/fish-v2.2.0-007EC7.svg?style=flat-square [license-badge]: https://img.shields.io/badge/license-MIT-007EC7.svg?style=flat-square -[omf-pulls-link]: https://github.com/fish-shell/oh-my-fish/pulls +[omf-pulls-link]: https://github.com/oh-my-fish/oh-my-fish/pulls diff --git a/bin/install b/bin/install index f7c1e1c..3d7a7bf 100755 --- a/bin/install +++ b/bin/install @@ -1,9 +1,9 @@ #!/bin/sh # # USAGE -# #1: curl -L git.io/omf | sh -# #2: curl -L git.io/omf > install && chmod +x install && ./install -# #3: OMF_CONFIG=~/.omf curl -L git.io/omf | sh +# #1: curl -L github.com/oh-my-fish/oh-my-fish/raw/master/bin/install | sh +# #2: curl -L github.com/oh-my-fish/oh-my-fish/raw/master/bin/install > install && chmod +x install && ./install +# #3: OMF_CONFIG=~/.omf curl -L github.com/oh-my-fish/oh-my-fish/raw/master/bin/install | sh # # ENV # XDG_DATA_HOME Base directory (~/.local/share) @@ -30,7 +30,7 @@ test -z ${XDG_CONFIG_HOME+_} && XDG_CONFIG_HOME="${HOME}/.config" test -z ${OMF_PATH+_} && OMF_PATH="${XDG_DATA_HOME}/omf" test -z ${OMF_CONFIG+_} && OMF_CONFIG="${XDG_CONFIG_HOME}/omf" -test -z ${OMF_REPO_URI+_} && OMF_REPO_URI="https://github.com/fish-shell/oh-my-fish" +test -z ${OMF_REPO_URI+_} && OMF_REPO_URI="https://github.com/oh-my-fish/oh-my-fish" test -z ${OMF_REPO_BRANCH+_} && OMF_REPO_BRANCH="master" die() { @@ -115,5 +115,5 @@ if omf_install; then # Do not swap process if running in a CI environment. [ -z ${CI+_} ] || exit 0 && exec "fish" < /dev/tty else - die "Oh My Fish couldn't install, but you can complain here → git.io/omf-issues" + die "Oh My Fish couldn't install, but you can complain here → github.com/oh-my-fish/oh-my-fish/issues" fi diff --git a/init.fish b/init.fish index 75cdad0..c32486a 100644 --- a/init.fish +++ b/init.fish @@ -9,7 +9,7 @@ # + Emit init_ event # # + Autoload {$OMF_PATH,$OMF_CONFIG}/functions -# + Source {$OMF_PATH,$OMF_CONFIG}/events → fish-shell/fish-shell/issues/845 +# + Source {$OMF_PATH,$OMF_CONFIG}/events # + Source $OMF_CONFIG/init.fish # # ENV diff --git a/lib/README.md b/lib/README.md index b2bdc83..04377d8 100644 --- a/lib/README.md +++ b/lib/README.md @@ -1,5 +1,5 @@

- +

diff --git a/pkg/omf/cli/omf.submit.fish b/pkg/omf/cli/omf.submit.fish index 2dad408..9d05d5a 100644 --- a/pkg/omf/cli/omf.submit.fish +++ b/pkg/omf/cli/omf.submit.fish @@ -35,7 +35,7 @@ function omf.submit -a name url -d "Submit a package to the registry" else echo "$url" > $OMF_PATH/db/$name echo (omf::em)"$pkg added to the local "(dirname $name)" registry."(omf::off) - echo "Want to contribute? Send us a PR → github.com/fish-shell/omf" + echo "Want to contribute? Send us a PR → github.com/oh-my-fish/oh-my-fish" return 0 end end diff --git a/pkg/omf/omf.fish b/pkg/omf/omf.fish index 26a1a29..03e2ef1 100644 --- a/pkg/omf/omf.fish +++ b/pkg/omf/omf.fish @@ -128,7 +128,7 @@ function omf -d "Oh My Fish" echo (omf::em)"Oh My Fish is up to date."(omf::off) else echo (omf::err)"Oh My Fish failed to update."(omf::off) - echo "Please open a new issue here → "(omf::em)"git.io/omf-issues"(omf::off) + echo "Please open a new issue here → "(omf::em)"github.com/oh-my-fish/oh-my-fish/issues"(omf::off) end omf.theme (cat $OMF_CONFIG/theme) omf.install_package (omf.list_installed_packages) diff --git a/pkg/omf/templates/pkg/README.md b/pkg/omf/templates/pkg/README.md index 7f7cf2c..551bd61 100644 --- a/pkg/omf/templates/pkg/README.md +++ b/pkg/omf/templates/pkg/README.md @@ -2,7 +2,7 @@ ![][license-badge]
- +
@@ -33,7 +33,7 @@ $ {{NAME}} [mit]: http://opensource.org/licenses/MIT [author]: http://github.com/{{USER}} [contributors]: https://github.com/{{USER}}/pkg-{{NAME}}/graphs/contributors -[omf-link]: https://www.github.com/fish-shell/oh-my-fish +[omf-link]: https://www.github.com/oh-my-fish/oh-my-fish [license-badge]: https://img.shields.io/badge/license-MIT-007EC7.svg?style=flat-square [travis-badge]: http://img.shields.io/travis/{{USER}}/{{NAME}}.svg?style=flat-square diff --git a/pkg/omf/templates/themes/README.md b/pkg/omf/templates/themes/README.md index e4d5c81..28246ce 100644 --- a/pkg/omf/templates/themes/README.md +++ b/pkg/omf/templates/themes/README.md @@ -1,5 +1,5 @@
- +
@@ -33,7 +33,7 @@ $ omf u {{NAME}} [mit]: http://opensource.org/licenses/MIT [author]: http://github.com/{{USER}} [contributors]: https://github.com/{{USER}}/{{NAME}}/graphs/contributors -[omf-link]: https://www.github.com/fish-shell/omf +[omf-link]: https://www.github.com/oh-my-fish/oh-my-fish [license-badge]: https://img.shields.io/badge/license-MIT-007EC7.svg?style=flat-square [travis-badge]: http://img.shields.io/travis/{{USER}}/{{NAME}}.svg?style=flat-square