From 3660b6f00b67cfbdd47e96b96504cda81509bf0c Mon Sep 17 00:00:00 2001
From: Eric Nielsen <eric@amalgamar.com.br>
Date: Tue, 26 Sep 2017 17:16:26 -0500
Subject: [PATCH] [completion] Consider the zcompdump_file variable

that could be defined in `.zimrc`, when doing the zcompile in
the completion module and when cleaning the cache.

A custom `${zcompdump_file}` would not be zcompiled or cleaned from the
cache without this correction.

Also, use zrecompile instead of the custom logic to call zcompile.
---
 modules/completion/init.zsh    | 9 ++-------
 modules/meta/functions/zmanage | 2 +-
 tools/zim_clean_cache          | 5 +++--
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/modules/completion/init.zsh b/modules/completion/init.zsh
index 1658946..b78b6e3 100644
--- a/modules/completion/init.zsh
+++ b/modules/completion/init.zsh
@@ -23,13 +23,8 @@ source ${0:h}/compdefs.zsh
 
 {
   # zcomple the .zcompdump in the background
-  zcompdump=${ZDOTDIR:-${HOME}}/.zcompdump
-
-  if [[ -s ${zcompdump} && ( ! -s ${zcompdump}.zwc || ${zcompdump} -nt ${zcompdump}.zwc) ]]; then
-    zcompile ${zcompdump}
-  fi
-  
-  unset zcompdump
+  autoload -U zrecompile
+  zrecompile -pq ${ZDOTDIR:-${HOME}}/${zcompdump_file:-.zcompdump}
 } &!
 
 
diff --git a/modules/meta/functions/zmanage b/modules/meta/functions/zmanage
index afb4320..075950c 100644
--- a/modules/meta/functions/zmanage
+++ b/modules/meta/functions/zmanage
@@ -25,7 +25,7 @@ case ${1} in
                ;;
   issue)       zsh ${tools}/zim_issue
                ;;
-  clean-cache) zsh ${tools}/zim_clean_cache && print 'Cleaned cache'
+  clean-cache) source ${tools}/zim_clean_cache && print 'Cleaned cache'
                ;;
   build-cache) source ${tools}/zim_build_cache && print 'Rebuilt cache'
                ;;
diff --git a/tools/zim_clean_cache b/tools/zim_clean_cache
index dd3ea7c..9375550 100644
--- a/tools/zim_clean_cache
+++ b/tools/zim_clean_cache
@@ -2,7 +2,8 @@
 # zim_clean_cache - removes all zcompiled files
 #
 
-find ${ZIM_HOME} -iname '*.zwc' | xargs rm
-rm -f ${ZDOTDIR:-${HOME}}/.{zshrc.zwc,zcompdump,zcompdump.zwc}
+find ${ZIM_HOME} -iname '*.zwc' -delete
+rm -f ${ZDOTDIR:-${HOME}}/.zshrc.zwc
+rm -f ${ZDOTDIR:-${HOME}}/${zcompdump_file:-.zcompdump}{,.zwc}
 
 print 'To rebuild the completion cache, please restart your terminal'