diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Darwin/Type/_retrieve_mac_apps | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index e60ad77b9..9ba79bf46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. diff --git a/Completion/Darwin/Type/_retrieve_mac_apps b/Completion/Darwin/Type/_retrieve_mac_apps index f24d36c3c..655170d3a 100644 --- a/Completion/Darwin/Type/_retrieve_mac_apps +++ b/Completion/Darwin/Type/_retrieve_mac_apps @@ -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 |