1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-02 10:01:11 +02:00

45655: _retrieve_mac_apps: Update for recent macOS

This commit is contained in:
dana 2020-04-05 20:09:10 -05:00
parent 05b15366f3
commit c70d734363
2 changed files with 10 additions and 2 deletions

View file

@ -1,3 +1,8 @@
2020-04-05 dana <dana@dana.is>
* 45655: Completion/Darwin/Type/_retrieve_mac_apps: Update
search paths and Spotlight index check for recent macOS
2020-04-05 Daniel Shahaf <d.s@daniel.shahaf.name>
* 45656: Etc/BUGS: Document the -o emacs segfault bug.

View file

@ -73,7 +73,7 @@ _retrieve_mac_apps() {
typeset retrieve
if ! zstyle -s ":completion:*:*:${service}:commands" search-method retrieve
then
if [[ -d /.Spotlight-V100 ]]; then
if [[ "$( command mdutil -s / 2>&1 )" == *enabled* ]]; then
# / is indexed to use Spotlight
retrieve=_mac_apps_spotlight_retrieve
else
@ -88,7 +88,10 @@ _retrieve_mac_apps() {
if ! zstyle -a ":completion:${curcontext}:" application-path app_dir_root
then
if [[ $retrieve = _mac_apps_old_retrieve ]]; then
app_dir_root=( {,/Developer,/Network,"$HOME"}/{Applications*(N),Desktop} )
app_dir_root=(
{,/Developer,/Network,/System,$HOME}/{Applications*(N),Desktop}
)
app_dir_root=( $^app_dir_root(N) )
else
app_dir_root=( / )
fi