From 730b69052af02aef21d2a37cccd10649416fde81 Mon Sep 17 00:00:00 2001 From: AtomicCoding Date: Thu, 5 Apr 2018 10:58:59 -0700 Subject: [PATCH 1/4] Updated ZCompiling --- login_init.zsh | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/login_init.zsh b/login_init.zsh index 0be8a94..b68dba4 100755 --- a/login_init.zsh +++ b/login_init.zsh @@ -23,32 +23,23 @@ zrecompile -pq ${dir}.zwc ${dir}/^([_.]*|prompt_*_setup|README*|*.zwc|*.zwc.old)(-.N) done - # zcompile enabled module init scripts + # zcompile enabled module init scripts and subdirs + setopt nullglob for zmodule (${zmodules}); do zmodule_dir=${ZIM_HOME}/modules/${zmodule} if [[ -d ${zmodule_dir} ]]; then - for file (${zmodule_dir}/init.zsh \ - ${zmodule_dir}/{,zsh-}${zmodule}.{zsh,plugin.zsh,zsh-theme,sh}); do + for file (${zmodule_dir}/**/*.{zsh,sh} \ + ${zmodule_dir}/*.{zsh,sh}); do if [[ -f ${file} ]]; then zrecompile -pq ${file} - break fi done fi done - + unsetopt nullglob # zcompile all prompt setup scripts for file in ${ZIM_HOME}/modules/prompt/functions/prompt_*_setup; do zrecompile -pq ${file} done - - # syntax-highlighting - for file in ${ZIM_HOME}/modules/syntax-highlighting/external/highlighters/**^test-data/*.zsh; do - zrecompile -pq ${file} - done - zrecompile -pq ${ZIM_HOME}/modules/syntax-highlighting/external/zsh-syntax-highlighting.zsh - - # zsh-histery-substring-search - zrecompile -pq ${ZIM_HOME}/modules/history-substring-search/external/zsh-history-substring-search.zsh - + ) &! From a5a6347d3a89a5d5d09d197395b4589ac8fd3cc4 Mon Sep 17 00:00:00 2001 From: Atomic Coding Date: Thu, 5 Apr 2018 11:51:22 -0700 Subject: [PATCH 2/4] Updated to match Zim Styling Guidelines --- login_init.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/login_init.zsh b/login_init.zsh index b68dba4..ef28527 100755 --- a/login_init.zsh +++ b/login_init.zsh @@ -29,7 +29,7 @@ zmodule_dir=${ZIM_HOME}/modules/${zmodule} if [[ -d ${zmodule_dir} ]]; then for file (${zmodule_dir}/**/*.{zsh,sh} \ - ${zmodule_dir}/*.{zsh,sh}); do + ${zmodule_dir}/*.{zsh,sh}); do if [[ -f ${file} ]]; then zrecompile -pq ${file} fi From 103745c4d3a738c55d97c5d57ac0fb479a2bf317 Mon Sep 17 00:00:00 2001 From: AtomicCoding Date: Thu, 5 Apr 2018 13:36:07 -0700 Subject: [PATCH 3/4] Minor Fix --- init.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.zsh b/init.zsh index 7f5c6b6..41271db 100755 --- a/init.zsh +++ b/init.zsh @@ -36,7 +36,7 @@ fi if [[ ! -d ${zmodule_dir} ]]; then print "No such module \"${zmodule}\"." >&2 else - for zmodule_file (${zmodule_dir}/init.zsh \ + for zmodule_file (${zmodule_dir}/init.{zsh,sh} \ ${zmodule_dir}/{,zsh-}${zmodule}.{zsh,plugin.zsh,zsh-theme,sh}); do if [[ -f ${zmodule_file} ]]; then source ${zmodule_file} From db981edc663c2517255eead24fe7a4915b9735a6 Mon Sep 17 00:00:00 2001 From: Atomic Coding Date: Fri, 6 Apr 2018 17:49:48 -0700 Subject: [PATCH 4/4] Zcompile zsh-themes --- login_init.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/login_init.zsh b/login_init.zsh index ef28527..b55e443 100755 --- a/login_init.zsh +++ b/login_init.zsh @@ -28,8 +28,8 @@ for zmodule (${zmodules}); do zmodule_dir=${ZIM_HOME}/modules/${zmodule} if [[ -d ${zmodule_dir} ]]; then - for file (${zmodule_dir}/**/*.{zsh,sh} \ - ${zmodule_dir}/*.{zsh,sh}); do + for file (${zmodule_dir}/**/*.{zsh,sh,zsh-theme} \ + ${zmodule_dir}/*.{zsh,sh,zsh-theme}); do if [[ -f ${file} ]]; then zrecompile -pq ${file} fi