diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/macos/README.md (renamed from plugins/osx/README.md) | 8 | ||||
| -rw-r--r-- | plugins/macos/_security (renamed from plugins/osx/_security) | 0 | ||||
| -rw-r--r-- | plugins/macos/macos.plugin.zsh (renamed from plugins/osx/osx.plugin.zsh) | 14 | ||||
| -rw-r--r-- | plugins/macos/music (renamed from plugins/osx/music) | 0 | ||||
| l--------- | plugins/macos/osx.plugin.zsh | 1 | ||||
| -rw-r--r-- | plugins/macos/spotify (renamed from plugins/osx/spotify) | 0 | ||||
| l--------- | plugins/osx | 1 |
7 files changed, 16 insertions, 8 deletions
diff --git a/plugins/osx/README.md b/plugins/macos/README.md index 50458f60e..1bc4244a4 100644 --- a/plugins/osx/README.md +++ b/plugins/macos/README.md @@ -1,11 +1,11 @@ -# OSX plugin +# MacOS plugin This plugin provides a few utilities to make it more enjoyable on macOS (previously named OSX). -To start using it, add the `osx` plugin to your plugins array in `~/.zshrc`: +To start using it, add the `macos` plugin to your plugins array in `~/.zshrc`: ```zsh -plugins=(... osx) +plugins=(... macos) ``` Original author: [Sorin Ionescu](https://github.com/sorin-ionescu) @@ -31,7 +31,7 @@ Original author: [Sorin Ionescu](https://github.com/sorin-ionescu) | `itunes` | _DEPRECATED_. Use `music` from macOS Catalina on | | `music` | Control Apple Music. Use `music -h` for usage details | | `spotify` | Control Spotify and search by artist, album, track… | -| `rmdsstore` | Remove .DS\_Store files recursively in a directory | +| `rmdsstore` | Remove .DS_Store files recursively in a directory | | `btrestart` | Restart the Bluetooth daemon | | `freespace` | Erases purgeable disk space with 0s on the selected disk | diff --git a/plugins/osx/_security b/plugins/macos/_security index e4ed585ac..e4ed585ac 100644 --- a/plugins/osx/_security +++ b/plugins/macos/_security diff --git a/plugins/osx/osx.plugin.zsh b/plugins/macos/macos.plugin.zsh index 16f16ddb6..4bcbbaead 100644 --- a/plugins/osx/osx.plugin.zsh +++ b/plugins/macos/macos.plugin.zsh @@ -1,3 +1,9 @@ +# 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' @@ -11,7 +17,7 @@ function btrestart() { sudo kextload -b com.apple.iokit.BroadcomBluetoothHostControllerUSBTransport } -function _omz_osx_get_frontmost_app() { +function _omz_macos_get_frontmost_app() { osascript 2>/dev/null <<EOF tell application "System Events" name of first item of (every process whose frontmost is true) @@ -24,7 +30,7 @@ function tab() { local command="cd \\\"$PWD\\\"; clear" (( $# > 0 )) && command="${command}; $*" - local the_app=$(_omz_osx_get_frontmost_app) + local the_app=$(_omz_macos_get_frontmost_app) if [[ "$the_app" == 'Terminal' ]]; then # Discarding stdout to quash "tab N of window id XXX" output @@ -77,7 +83,7 @@ function vsplit_tab() { local command="cd \\\"$PWD\\\"; clear" (( $# > 0 )) && command="${command}; $*" - local the_app=$(_omz_osx_get_frontmost_app) + local the_app=$(_omz_macos_get_frontmost_app) if [[ "$the_app" == 'iTerm' ]]; then osascript <<EOF @@ -125,7 +131,7 @@ function split_tab() { local command="cd \\\"$PWD\\\"; clear" (( $# > 0 )) && command="${command}; $*" - local the_app=$(_omz_osx_get_frontmost_app) + local the_app=$(_omz_macos_get_frontmost_app) if [[ "$the_app" == 'iTerm' ]]; then osascript 2>/dev/null <<EOF diff --git a/plugins/osx/music b/plugins/macos/music index 50566797b..50566797b 100644 --- a/plugins/osx/music +++ b/plugins/macos/music diff --git a/plugins/macos/osx.plugin.zsh b/plugins/macos/osx.plugin.zsh new file mode 120000 index 000000000..73d718d43 --- /dev/null +++ b/plugins/macos/osx.plugin.zsh @@ -0,0 +1 @@ +macos.plugin.zsh
\ No newline at end of file diff --git a/plugins/osx/spotify b/plugins/macos/spotify index 663215a74..663215a74 100644 --- a/plugins/osx/spotify +++ b/plugins/macos/spotify diff --git a/plugins/osx b/plugins/osx new file mode 120000 index 000000000..a8d0f9c48 --- /dev/null +++ b/plugins/osx @@ -0,0 +1 @@ +macos
\ No newline at end of file |