8168ec0174e7e3212be20ecc74810155772abff1

Author
Marc Cornellà <hello@mcornella.com>
Committer
Marc Cornellà <hello@mcornella.com>
Date

Message

refactor!: remove deprecated plugins

BREAKING CHANGE: the following deprecated plugins have been removed:
`cargo`, `copydir`, `npx`, `osx`, and `rustup`. See the wiki for more info:
https://github.com/ohmyzsh/ohmyzsh/wiki/Plugins#removed

refactor(rustup)!: remove deprecated plugin

BREAKING CHANGE: the plugin was deprecated and is now removed. See the wiki for more info:
https://github.com/ohmyzsh/ohmyzsh/wiki/Plugins#removed

Diff

  1diff --git a/plugins/cargo/README.md b/plugins/cargo/README.md
  2deleted file mode 100644
  3index 93e69ae7fad2ace0e8d1ba940e049ffa8539cc85..0000000000000000000000000000000000000000
  4--- a/plugins/cargo/README.md
  5+++ /dev/null
  6@@ -1,3 +0,0 @@
  7-# cargo
  8-
  9-**Deprecated: use the [`rust`](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/rust) plugin instead.**
 10diff --git a/plugins/cargo/cargo.plugin.zsh b/plugins/cargo/cargo.plugin.zsh
 11deleted file mode 100644
 12index 692025e8f4feba24a9512f917480dda97c8d955c..0000000000000000000000000000000000000000
 13--- a/plugins/cargo/cargo.plugin.zsh
 14+++ /dev/null
 15@@ -1,7 +0,0 @@
 16-print ${(%):-'%F{yellow}The `cargo` plugin is deprecated and has been moved to the `rust` plugin.'}
 17-print ${(%):-'Please update your .zshrc to use the `%Brust%b` plugin instead.%f'}
 18-
 19-(( ${fpath[(Ie)$ZSH/plugins/rust]} )) || {
 20-  fpath=("$ZSH/plugins/rust" $fpath)
 21-  source "$ZSH/plugins/rust/rust.plugin.zsh"
 22-}
 23diff --git a/plugins/copydir/README.md b/plugins/copydir/README.md
 24deleted file mode 100644
 25index cf24b789f4020763730c635c545eccbd34fbe4e8..0000000000000000000000000000000000000000
 26--- a/plugins/copydir/README.md
 27+++ /dev/null
 28@@ -1,3 +0,0 @@
 29-# copydir plugin
 30-
 31-This plugin is deprecated. Use the [`copypath` plugin](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/copypath) instead.
 32diff --git a/plugins/copydir/copydir.plugin.zsh b/plugins/copydir/copydir.plugin.zsh
 33deleted file mode 100644
 34index a2b489ec040864704f58fe3eb09bfa2a9b8733f7..0000000000000000000000000000000000000000
 35--- a/plugins/copydir/copydir.plugin.zsh
 36+++ /dev/null
 37@@ -1,7 +0,0 @@
 38-echo ${(%):-'%F{yellow}The `%Bcopydir%b` plugin is deprecated. Use the `%Bcopypath%b` plugin instead.%f'}
 39-source "$ZSH/plugins/copypath/copypath.plugin.zsh"
 40-
 41-# TODO: 2022-02-22: Remove deprecated copydir function.
 42-function copydir {
 43-  copypath
 44-}
 45diff --git a/plugins/npx/README.md b/plugins/npx/README.md
 46deleted file mode 100644
 47index 4b2aba8f0bd70a8a1055dedc5a26039346334254..0000000000000000000000000000000000000000
 48--- a/plugins/npx/README.md
 49+++ /dev/null
 50@@ -1,16 +0,0 @@
 51-# npx plugin
 52-
 53-## Deprecation
 54-
 55-Since npm v7, `npx` has been moved to `npm exec`. With the move, [the `--shell-auto-fallback` argument
 56-for `npx` has been removed](https://github.com/npm/cli/blob/v7.0.0/docs/content/cli-commands/npm-exec.md#compatibility-with-older-npx-versions):
 57-
 58-> Shell fallback functionality is removed, as it is not advisable.
 59-
 60-When using npm v7, you'll get this error:
 61-
 62-> npx: the --shell-auto-fallback argument has been removed
 63-
 64-If you get this error, just disable the plugin by removing it from the plugins array in your zshrc file.
 65-This plugin will no longer be maintained and will be removed in the future, when the older `npx` versions
 66-are no longer available.
 67diff --git a/plugins/npx/npx.plugin.zsh b/plugins/npx/npx.plugin.zsh
 68deleted file mode 100644
 69index c1e2eca9889c21574db0385908c1c5b0f33c40b1..0000000000000000000000000000000000000000
 70--- a/plugins/npx/npx.plugin.zsh
 71+++ /dev/null
 72@@ -1,12 +0,0 @@
 73-if (( ! $+commands[npx] )); then
 74-  return
 75-fi
 76-
 77-if ! npx_fallback_script="$(npx --shell-auto-fallback zsh 2>/dev/null)"; then
 78-  print -u2 ${(%):-"%F{yellow}This \`npx\` version ($(npx --version)) is not supported.%f"}
 79-else
 80-  source <(<<< "$npx_fallback_script")
 81-fi
 82-
 83-print -u2 ${(%):-"%F{yellow}The \`npx\` plugin is deprecated and will be removed soon. %BPlease disable it%b.%f"}
 84-unset npx_fallback_script
 85diff --git a/plugins/osx/README.md b/plugins/osx/README.md
 86deleted file mode 100644
 87index 98d8595455efb6353b8d41d984f1de376a669f38..0000000000000000000000000000000000000000
 88--- a/plugins/osx/README.md
 89+++ /dev/null
 90@@ -1,3 +0,0 @@
 91-# osx plugin
 92-
 93-**Deprecated: use the [`macos`](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/macos) plugin instead.**
 94diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
 95deleted file mode 100644
 96index 3b09359814822f676c02daf03d965fbf68d3dfb9..0000000000000000000000000000000000000000
 97--- a/plugins/osx/osx.plugin.zsh
 98+++ /dev/null
 99@@ -1,5 +0,0 @@
100-print -u2 ${(%):-'%F{yellow}The `osx` plugin is deprecated and has been renamed to `macos`.'}
101-print -u2 ${(%):-'Please update your .zshrc to use the `%Bmacos%b` plugin instead.%f'}
102-
103-(( ${fpath[(Ie)$ZSH/plugins/macos]} )) || fpath=("$ZSH/plugins/macos" $fpath)
104-source "$ZSH/plugins/macos/macos.plugin.zsh"
105diff --git a/plugins/rustup/README.md b/plugins/rustup/README.md
106deleted file mode 100644
107index c620e72a853552c4cd25ad8093c2f1958ced915a..0000000000000000000000000000000000000000
108--- a/plugins/rustup/README.md
109+++ /dev/null
110@@ -1,3 +0,0 @@
111-# rustup
112-
113-**Deprecated: use the [`rust`](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/rust) plugin instead.**
114diff --git a/plugins/rustup/rustup.plugin.zsh b/plugins/rustup/rustup.plugin.zsh
115deleted file mode 100644
116index ef141cf8fdaaf37c5b9458b07a8ff2c4f8d5de05..0000000000000000000000000000000000000000
117--- a/plugins/rustup/rustup.plugin.zsh
118+++ /dev/null
119@@ -1,7 +0,0 @@
120-print ${(%):-'%F{yellow}The `rustup` plugin is deprecated and has been moved to the `rust` plugin.'}
121-print ${(%):-'Please update your .zshrc to use the `%Brust%b` plugin instead.%f'}
122-
123-(( ${fpath[(Ie)$ZSH/plugins/rust]} )) || {
124-  fpath=("$ZSH/plugins/rust" $fpath)
125-  source "$ZSH/plugins/rust/rust.plugin.zsh"
126-}