summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorMarc Cornellà <hello@mcornella.com>2021-11-17 10:53:17 +0100
committerMarc Cornellà <hello@mcornella.com>2021-11-17 10:53:17 +0100
commitb60b3f184275c39800dd7284d6904fcf295b3956 (patch)
tree7517b8a89ffc4aa3558f0af8619de174a6e76071 /plugins
parent2b379ec42c8675d6076737e1373767c160f5ae70 (diff)
downloadzsh-b60b3f184275c39800dd7284d6904fcf295b3956.tar.gz
zsh-b60b3f184275c39800dd7284d6904fcf295b3956.tar.bz2
zsh-b60b3f184275c39800dd7284d6904fcf295b3956.zip
fix(osx): deprecate `osx` plugin without symlink (#10428)
Fixes #10428
Diffstat (limited to 'plugins')
-rw-r--r--plugins/macos/macos.plugin.zsh6
l---------plugins/macos/osx.plugin.zsh1
l---------plugins/osx1
-rw-r--r--plugins/osx/README.md3
-rw-r--r--plugins/osx/osx.plugin.zsh5
5 files changed, 8 insertions, 8 deletions
diff --git a/plugins/macos/macos.plugin.zsh b/plugins/macos/macos.plugin.zsh
index 4bcbbaead..6a91be336 100644
--- a/plugins/macos/macos.plugin.zsh
+++ b/plugins/macos/macos.plugin.zsh
@@ -1,9 +1,3 @@
-# Check if 'osx' is still in the plugins list and prompt to change to 'macos'
-if [[ -n "${plugins[(r)osx]}" ]]; then
- print ${(%):-"%F{yellow}The \`osx\` plugin is deprecated and has been renamed to \`macos\`."}
- print ${(%):-"Please update your .zshrc to use the \`%Bmacos%b\` plugin instead.%f"}
-fi
-
# Open the current directory in a Finder window
alias ofd='open_command $PWD'
diff --git a/plugins/macos/osx.plugin.zsh b/plugins/macos/osx.plugin.zsh
deleted file mode 120000
index 73d718d43..000000000
--- a/plugins/macos/osx.plugin.zsh
+++ /dev/null
@@ -1 +0,0 @@
-macos.plugin.zsh \ No newline at end of file
diff --git a/plugins/osx b/plugins/osx
deleted file mode 120000
index a8d0f9c48..000000000
--- a/plugins/osx
+++ /dev/null
@@ -1 +0,0 @@
-macos \ No newline at end of file
diff --git a/plugins/osx/README.md b/plugins/osx/README.md
new file mode 100644
index 000000000..98d859545
--- /dev/null
+++ b/plugins/osx/README.md
@@ -0,0 +1,3 @@
+# osx plugin
+
+**Deprecated: use the [`macos`](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/macos) plugin instead.**
diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
new file mode 100644
index 000000000..9304e7f32
--- /dev/null
+++ b/plugins/osx/osx.plugin.zsh
@@ -0,0 +1,5 @@
+print ${(%):-'%F{yellow}The `osx` plugin is deprecated and has been renamed to `macos`.'}
+print ${(%):-'Please update your .zshrc to use the `%Bmacos%b` plugin instead.%f'}
+
+(( ${fpath[(Ie)$ZSH/plugins/macos]} )) || fpath=("$ZSH/plugins/macos" $fpath)
+source "$ZSH/plugins/macos/macos.plugin.zsh"