`b80b1a1e8b30e5f2a7c4977019cf56e72c434037`

Author: Marc Cornellà <marc.cornella@live.com>
Committer: Robby Russell <robby@planetargon.com>
Date: 2019-11-21 01:26 UTC

Message

Actions to take after repository migration is complete (#8394)

* Change project URL from robbyrussell to ohmyzsh org

* Update git remote to use ohmyzsh org repository

Diff

This diff is truncated to protect this page.

  1diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
  2index f575157c21876fc09fb9bfa48297ad6a4ad1f158..be67e93b0a4242e8f96903d6b93bbc8a626afaee 100644
  3--- a/CONTRIBUTING.md
  4+++ b/CONTRIBUTING.md
  5@@ -31,7 +31,7 @@ your problem.
  6 
  7 If you find one, comment on it so we can know there are more people experiencing it.
  8 
  9-If not, look at the [Troubleshooting](https://github.com/robbyrussell/oh-my-zsh/wiki/Troubleshooting)
 10+If not, look at the [Troubleshooting](https://github.com/ohmyzsh/ohmyzsh/wiki/Troubleshooting)
 11 page for instructions on how to gather data to better debug your problem.
 12 
 13 Then, you can go ahead and create an issue with as much detail as you can provide.
 14@@ -62,7 +62,7 @@ maintainers) by mentioning their GitHub handle (starting with `@`) in your messa
 15 
 16 You should be familiar with the basics of
 17 [contributing on GitHub](https://help.github.com/articles/using-pull-requests) and have a fork
 18-[properly set up](https://github.com/robbyrussell/oh-my-zsh/wiki/Contribution-Technical-Practices).
 19+[properly set up](https://github.com/ohmyzsh/ohmyzsh/wiki/Contribution-Technical-Practices).
 20 
 21 You MUST always create PRs with _a dedicated branch_ based on the latest upstream tree.
 22 
 23@@ -85,7 +85,7 @@ maintainers) by mentioning their GitHub handle (starting with `@`) in your messa
 24 
 25 ### You have an addition
 26 
 27-Please [do not](https://github.com/robbyrussell/oh-my-zsh/wiki/Themes#dont-send-us-your-theme-for-now)
 28+Please [do not](https://github.com/ohmyzsh/ohmyzsh/wiki/Themes#dont-send-us-your-theme-for-now)
 29 send themes for now.
 30 
 31 Please be so kind as to [search](#use-the-search-luke) for any pending, merged or rejected Pull Requests
 32@@ -109,7 +109,7 @@ to help you check whether a similar contribution to yours already exists. Please
 33 before making any contribution, it avoids duplicates and eases maintenance. Trust me,
 34 that works 90% of the time.
 35 
 36-You can also take a look at the [FAQ](https://github.com/robbyrussell/oh-my-zsh/wiki/FAQ)
 37+You can also take a look at the [FAQ](https://github.com/ohmyzsh/ohmyzsh/wiki/FAQ)
 38 to be sure your contribution has not already come up.
 39 
 40 If all fails, your thing has probably not been reported yet, so you can go ahead
 41@@ -121,5 +121,5 @@ and [create an issue](#reporting-issues) or [submit a PR](#submitting-pull-reque
 42 
 43 Very nice!! :)
 44 
 45-Please have a look at the [Volunteer](https://github.com/robbyrussell/oh-my-zsh/wiki/Volunteers)
 46+Please have a look at the [Volunteer](https://github.com/ohmyzsh/ohmyzsh/wiki/Volunteers)
 47 page for instructions on where to start and more.
 48diff --git a/LICENSE.txt b/LICENSE.txt
 49index eb9978a7a523840cce8d9377200d9be93086957b..7431907a633d59ed6be68252c39cb165e47f169d 100644
 50--- a/LICENSE.txt
 51+++ b/LICENSE.txt
 52@@ -1,6 +1,6 @@
 53 MIT License
 54 
 55-Copyright (c) 2009-2019 Robby Russell and contributors (https://github.com/robbyrussell/oh-my-zsh/contributors)
 56+Copyright (c) 2009-2019 Robby Russell and contributors (https://github.com/ohmyzsh/ohmyzsh/contributors)
 57 
 58 Permission is hereby granted, free of charge, to any person obtaining a copy
 59 of this software and associated documentation files (the "Software"), to deal
 60diff --git a/README.md b/README.md
 61index 2a5ec178a1d7660446564ab6084cf4eef963dd99..ac4b3879c689b04a0f2efa623b1189328dc21364 100644
 62--- a/README.md
 63+++ b/README.md
 64@@ -22,7 +22,7 @@ To learn more, visit [ohmyz.sh](https://ohmyz.sh) and follow [@ohmyzsh](https://
 65 ### Prerequisites
 66 
 67 * A Unix-like operating system: macOS, Linux, BSD. On Windows: WSL is preferred, but cygwin or msys also mostly work.
 68-* [Zsh](https://www.zsh.org) should be installed (v4.3.9 or more recent). If not pre-installed (run `zsh --version` to confirm), check the following instructions here: [Installing ZSH](https://github.com/robbyrussell/oh-my-zsh/wiki/Installing-ZSH)
 69+* [Zsh](https://www.zsh.org) should be installed (v4.3.9 or more recent). If not pre-installed (run `zsh --version` to confirm), check the following instructions here: [Installing ZSH](https://github.com/ohmyzsh/ohmyzsh/wiki/Installing-ZSH)
 70 * `curl` or `wget` should be installed
 71 * `git` should be installed
 72 
 73@@ -33,13 +33,13 @@ Oh My Zsh is installed by running one of the following commands in your terminal
 74 #### via curl
 75 
 76 ```shell
 77-sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
 78+sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
 79 ```
 80 
 81 #### via wget
 82 
 83 ```shell
 84-sh -c "$(wget -O- https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
 85+sh -c "$(wget -O- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
 86 ```
 87 
 88 #### Manual inspection
 89@@ -49,7 +49,7 @@ that by downloading the install script first, looking through it so everything l
 90 then running it:
 91 
 92 ```shell
 93-curl -Lo install.sh https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh
 94+curl -Lo install.sh https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh
 95 sh install.sh
 96 ```
 97 
 98@@ -57,7 +57,7 @@ sh install.sh
 99 
100 ### Plugins
101 
102diff --git a/plugins/bundler/README.md b/plugins/bundler/README.md
103index a7d40cd0a4b7a16d998481b67780b84ddd11e14c..9f211b02f9093f9e36f1a8edaa8e1d8ecdec1ae6 100644
104--- a/plugins/bundler/README.md
105+++ b/plugins/bundler/README.md
106@@ -42,7 +42,7 @@ This will exclude the `foreman` and `spin` gems (i.e. their executable) from bei
107 
108 ## Excluded gems
109 
110-These gems should not be called with `bundle exec`. Please see [issue #2923](https://github.com/robbyrussell/oh-my-zsh/pull/2923) on GitHub for clarification.
111+These gems should not be called with `bundle exec`. Please see [issue #2923](https://github.com/ohmyzsh/ohmyzsh/pull/2923) on GitHub for clarification.
112 
113 `berks`
114 `foreman`
115diff --git a/plugins/emotty/README.md b/plugins/emotty/README.md
116index 2cfbe120cb49aa3eb8b45c74a065f7f62b8fde6d..ee571705afaca839a55019842e979d182937a192 100644
117--- a/plugins/emotty/README.md
118+++ b/plugins/emotty/README.md
119@@ -8,7 +8,7 @@ To use it, add emotty to the plugins array in your zshrc file:
120 plugins=(... emotty)
121 ```
122 
123-**NOTE:** it requires the [emoji plugin](https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins/emoji).
124+**NOTE:** it requires the [emoji plugin](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/emoji).
125 
126 ## Usage
127 
128diff --git a/plugins/fedora/README.md b/plugins/fedora/README.md
129index 6594799b32a4ede722014d9d9878ae52b31c369c..85d8d7deab2075287fc516fa3b6a73a7e8ec4f8b 100644
130--- a/plugins/fedora/README.md
131+++ b/plugins/fedora/README.md
132@@ -1 +1 @@
133-The fedora plugin is deprecated. Use the [dnf plugin](https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins/dnf) instead.
134+The fedora plugin is deprecated. Use the [dnf plugin](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/dnf) instead.
135diff --git a/plugins/gitfast/README.md b/plugins/gitfast/README.md
136index 84e35d77cc734483b837c87118cc666ad4d27f54..23db5393b00c76ecb9583035ffcd7c0826821c3b 100644
137--- a/plugins/gitfast/README.md
138+++ b/plugins/gitfast/README.md
139@@ -11,5 +11,5 @@ plugins=(... gitfast)
140 ## Aliases
141 
142 An earlier version of the plugin also loaded the git plugin. If you want to keep those
143-aliases enable the [git plugin](https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins/git)
144+aliases enable the [git plugin](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/git)
145 as well.
146diff --git a/plugins/go/README.md b/plugins/go/README.md
147index 6ce6f4ee26d36a2738dba22e78c751cd69b2d7f0..bf43b9febb93fe0e5a70d8e86f16d6a8a876e073 100644
148--- a/plugins/go/README.md
149+++ b/plugins/go/README.md
150@@ -1 +1 @@
151-The go plugin is deprecated. Use the [golang plugin](https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins/golang) instead.
152+The go plugin is deprecated. Use the [golang plugin](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/golang) instead.
153diff --git a/plugins/history-substring-search/README.md b/plugins/history-substring-search/README.md
154index 7fb0fa0b657f8b0cc8c592a3efdc089665f5325f..0ffb21351b2b637c7a7788205c2a02ee2593a711 100644
155--- a/plugins/history-substring-search/README.md
156+++ b/plugins/history-substring-search/README.md
157@@ -9,7 +9,7 @@ You can also use K and J in VI mode or ^P and ^N in EMACS mode for the same.
158 [1]: https://fishshell.com
159 [2]: https://www.zsh.org/mla/users/2009/msg00818.html
160 [3]: https://sourceforge.net/projects/fizsh/
161-[4]: https://github.com/robbyrussell/oh-my-zsh/pull/215
162+[4]: https://github.com/ohmyzsh/ohmyzsh/pull/215
163 [5]: https://github.com/zsh-users/zsh-history-substring-search
164 [6]: https://github.com/zsh-users/zsh-syntax-highlighting
165 
166diff --git a/plugins/meteor/README.md b/plugins/meteor/README.md
167index 4bee87f8faa5d834dc339000b199220e53bb3b08..187a45a62e33531984dde922919f537311436bfc 100644
168--- a/plugins/meteor/README.md
169+++ b/plugins/meteor/README.md
170@@ -1,6 +1,6 @@
171 ## Introduction
172 
173-The [meteor plugin](https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins/meteor) provides many
174+The [meteor plugin](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/meteor) provides many
175 [useful aliases](#aliases) as well as completion for the `meteor` command.
176 
177 Enable it by adding `meteor` to the plugins array in your zshrc file:
178diff --git a/plugins/mvn/README.md b/plugins/mvn/README.md
179index 88f5be8ba3a70e889c6a59246be582f7ce5f0197..3bbba5b4fb9764e2b1b5dc02e4403d1c4ab7530f 100644
180--- a/plugins/mvn/README.md
181+++ b/plugins/mvn/README.md
182@@ -55,4 +55,4 @@ has colored output, so this function will be soon removed from the plugin.
183 ### Known bugs
184 
185 It has a bug where it will swallow mvn prompts for user input, _e.g._ when using
186-`archetype:generate`. See [#5052](https://github.com/robbyrussell/oh-my-zsh/issues/5052).
187+`archetype:generate`. See [#5052](https://github.com/ohmyzsh/ohmyzsh/issues/5052).
188diff --git a/plugins/ng/README.md b/plugins/ng/README.md
189index 86ad64041284fd29f7fcb34d4af0dfb59c0b1b7a..94a450c18d4cff25b5047823e3f9b451ef5c95e8 100644
190--- a/plugins/ng/README.md
191+++ b/plugins/ng/README.md
192@@ -1,6 +1,6 @@
193 ## NG Plugin
194 
195-This [ng plugin](https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins/ng)
196+This [ng plugin](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/ng)
197  adds completion support for Angular's CLI (named ng).
198 
199 Ng is hosted on [ng home](https://github.com/catull/angular-cli)
200diff --git a/plugins/percol/README.md b/plugins/percol/README.md
201index b262e414eca153f99e867445614332a35806add7..ec5de4f86bd232f6b468c4669f4f603a6f5ab804 100644
202--- a/plugins/percol/README.md
203+++ b/plugins/percol/README.md
204@@ -1,6 +1,6 @@
205 ## percol
206 
207-Provides some useful function to make [percol](https://github.com/mooz/percol) work with zsh history and [jump plugin](https://github.com/robbyrussell/oh-my-zsh/blob/master/plugins/jump/jump.plugin.zsh)
208+Provides some useful function to make [percol](https://github.com/mooz/percol) work with zsh history and [jump plugin](https://github.com/ohmyzsh/ohmyzsh/blob/master/plugins/jump/jump.plugin.zsh)
209 
210 ### Requirements
211 
212@@ -8,7 +8,7 @@ Provides some useful function to make [percol](https://github.com/mooz/percol) w
213 pip install percol
214 ```
215 
216-And [jump](https://github.com/robbyrussell/oh-my-zsh/blob/master/plugins/jump/jump.plugin.zsh) for `oh-my-zsh` is a optional requirement.
217+And [jump](https://github.com/ohmyzsh/ohmyzsh/blob/master/plugins/jump/jump.plugin.zsh) for `oh-my-zsh` is a optional requirement.
218 
219 ### Usage
220 
221diff --git a/plugins/rake/README.md b/plugins/rake/README.md
222index e235bd91a2c53179e54e13aeb4ef6da0c1a0b2fd..e888c078577bb4f7918ff02765385220edd5e4c5 100644
223--- a/plugins/rake/README.md
224+++ b/plugins/rake/README.md
225@@ -34,4 +34,4 @@ The plugin also aliases `rake` to [`jimweirich`](https://github.com/jimweirich),
226 and big time contributor to the Ruby open source community. He passed away in 2014:
227 
228 > Thank you Jim for everything you contributed to the Ruby and open source community 
229-> over the years. We will miss you dearly. — [**@robbyrussell**](https://github.com/robbyrussell/oh-my-zsh/commit/598a9c6f990756386517d66b6bcf77e53791e905)
230+> over the years. We will miss you dearly. — [**@robbyrussell**](https://github.com/ohmyzsh/ohmyzsh/commit/598a9c6f990756386517d66b6bcf77e53791e905)
231diff --git a/plugins/thefuck/README.md b/plugins/thefuck/README.md
232index a9b7550d7f3e88dfc6ac2b6acb2b2febb21a9350..bd407b3167d4e8f03d20fedef3bfcedabe920b69 100644
233--- a/plugins/thefuck/README.md
234+++ b/plugins/thefuck/README.md
235@@ -6,4 +6,4 @@
236 Press `ESC` twice to correct previous console command.
237 
238 ## Notes
239-`Esc`-`Esc` key binding conflicts with [sudo](https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins/sudo) plugin.
240+`Esc`-`Esc` key binding conflicts with [sudo](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/sudo) plugin.
241diff --git a/plugins/urltools/README.md b/plugins/urltools/README.md
242index 548301c72443038f316b5832d406cc58ce3f448b..29c3710707f6ccc0da866fc87fee0eb713f2c266 100644
243--- a/plugins/urltools/README.md
244+++ b/plugins/urltools/README.md
245@@ -21,9 +21,9 @@ Original idea and aliases: [Ruslan Spivak](https://ruslanspivak.wordpress.com/20
246 ## Examples
247 
248 ```zsh
249-urlencode 'https://github.com/robbyrussell/oh-my-zsh/search?q=urltools&type=Code'
250-# returns https%3A%2F%2Fgithub.com%2Frobbyrussell%2Foh-my-zsh%2Fsearch%3Fq%3Durltools%26type%3DCode
251+urlencode 'https://github.com/ohmyzsh/ohmyzsh/search?q=urltools&type=Code'
252+# returns https%3A%2F%2Fgithub.com%2Fohmyzsh%2Fohmyzsh%2Fsearch%3Fq%3Durltools%26type%3DCode
253 
254-urldecode 'https%3A%2F%2Fgithub.com%2Frobbyrussell%2Foh-my-zsh%2Fsearch%3Fq%3Durltools%26type%3DCode'
255-# returns https://github.com/robbyrussell/oh-my-zsh/search?q=urltools&type=Code
256+urldecode 'https%3A%2F%2Fgithub.com%2Fohmyzsh%2Fohmyzsh%2Fsearch%3Fq%3Durltools%26type%3DCode'
257+# returns https://github.com/ohmyzsh/ohmyzsh/search?q=urltools&type=Code
258 ```
259diff --git a/plugins/wd/README.md b/plugins/wd/README.md
260index b1deeffd512add4ce1c1024eb6ad4fdf56a8e9d5..91d5d0ae79c15bd539b2f6071ec8fd8b49d7ce66 100644
261--- a/plugins/wd/README.md
262+++ b/plugins/wd/README.md
263@@ -13,7 +13,7 @@ wd
264 
265 ### oh-my-zsh
266 
267-`wd` comes bundled with [oh-my-zshell](https://github.com/robbyrussell/oh-my-zsh)!
268+`wd` comes bundled with [oh-my-zshell](https://github.com/ohmyzsh/ohmyzsh)!
269 
270 Just add the plugin in your `~/.zshrc` file:
271 
272@@ -53,7 +53,7 @@ Run either in terminal:
273 
274 #### Completion
275 
276diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
277index 3cc5ad46c75cfd0cbdce394ea5acf0736e262a2f..d16713ccb2e8794d42fcbd66804e930ff2b94c13 100644
278--- a/templates/zshrc.zsh-template
279+++ b/templates/zshrc.zsh-template
280@@ -7,7 +7,7 @@ export ZSH=$HOME/.oh-my-zsh
281 # Set name of the theme to load --- if set to "random", it will
282 # load a random theme each time oh-my-zsh is loaded, in which case,
283 # to know which specific one was loaded, run: echo $RANDOM_THEME
284-# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
285+# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
286 ZSH_THEME="robbyrussell"
287 
288 # Set list of themes to pick from when loading at random
289diff --git a/themes/gallifrey.zsh-theme b/themes/gallifrey.zsh-theme
290index 7685470646a3d0082a188e27567b4fc301b37727..47b057fa369c14b982a4b68ff127c1ea084bab1f 100644
291--- a/themes/gallifrey.zsh-theme
292+++ b/themes/gallifrey.zsh-theme
293@@ -1,4 +1,4 @@
294-# ZSH Theme - Preview: https://github.com/robbyrussell/oh-my-zsh/wiki/Themes#gallifrey
295+# ZSH Theme - Preview: https://github.com/ohmyzsh/ohmyzsh/wiki/Themes#gallifrey
296 return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
297 host_color="%(!.%{$fg[red]%}.%{$fg[green]%})"
298 
299diff --git a/tools/install.sh b/tools/install.sh
300index a5a90e6f65e7365f7b918f7d80e9613698cc233e..ae248be89a64300a5275c7950e9d7714bb75f173 100755
301--- a/tools/install.sh
302+++ b/tools/install.sh
303@@ -1,12 +1,12 @@
304 #!/bin/sh
305 #
306 # This script should be run via curl:
307-#   sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
308+#   sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
309 # or wget:
310-#   sh -c "$(wget -qO- https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
311+#   sh -c "$(wget -qO- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
312 #
313 # As an alternative, you can first download the install script and run it afterwards:
314-#   wget https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh
315+#   wget https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh
316 #   sh install.sh
317 #
318 # You can tweak the install behavior by setting variables when running the script. For
319@@ -15,7 +15,7 @@
320 #
321 # Respects the following environment variables:
322 #   ZSH     - path to the Oh My Zsh repository folder (default: $HOME/.oh-my-zsh)
323-#   REPO    - name of the GitHub repo to install from (default: robbyrussell/oh-my-zsh)
324+#   REPO    - name of the GitHub repo to install from (default: ohmyzsh/ohmyzsh)
325 #   REMOTE  - full remote URL of the git repo to install (default: GitHub via HTTPS)
326 #   BRANCH  - branch to check out immediately after install (default: master)
327 #
328@@ -33,7 +33,7 @@ set -e
329 
330 # Default settings
331 ZSH=${ZSH:-~/.oh-my-zsh}
332-REPO=${REPO:-robbyrussell/oh-my-zsh}
333+REPO=${REPO:-ohmyzsh/ohmyzsh}
334 REMOTE=${REMOTE:-https://github.com/${REPO}.git}
335 BRANCH=${BRANCH:-master}
336 
337diff --git a/tools/upgrade.sh b/tools/upgrade.sh
338index f64a0096e82b486dcf8e900c9b3b359393f88837..55768cd6eee6e0486c9861a805f9e7f8ebb0ea6d 100644
339--- a/tools/upgrade.sh
340+++ b/tools/upgrade.sh
341@@ -31,6 +31,12 @@ git config fsck.zeroPaddedFilemode ignore
342 git config fetch.fsck.zeroPaddedFilemode ignore
343 git config receive.fsck.zeroPaddedFilemode ignore
344 
345+# Update upstream remote to ohmyzsh org
346+remote=$(git remote -v | awk '/https:\/\/github\.com\/robbyrussell\/oh-my-zsh\.git/{ print $1; exit }')
347+if [[ -n "$remote" ]]; then
348+  git remote set-url "$remote" "https://github.com/ohmyzsh/ohmyzsh.git"
349+fi
350+
351 printf "${BLUE}%s${NORMAL}\n" "Updating Oh My Zsh"
352 if git pull --rebase --stat origin master
353 then