adam/zim
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleanup of zlogin

Browse Source 
Change the scope of the job: {} to (); removes need for unfunction

Because we changed the job scope, we no longer need the anonymous
function/local var.
This commit is contained in:
Matt Hamilton 2015-12-28 02:09:44 -05:00
parent b6b3620f34
commit fb7defa729
1 changed files with 36 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
templates/zlogin
View File

@ -2,26 +2,25 @@
# startup file read in interactive login shell # startup file read in interactive login shell
# not run again in subsuquent shells # not run again in subsuquent shells
# #
# The following code helps us by optimizing the existing framework. # The following code helps us by optimizing the existing framework.
# This includes zcompile, zcompdump, etc. Options can be adjusted in .zimrc # This includes zcompile, zcompdump, etc.
# #
# Function to determine the need of a zcompile. If the .zwc file (
# does not exist, or the base file is newer, we need to compile. # Function to determine the need of a zcompile. If the .zwc file
local zcompare() { # does not exist, or the base file is newer, we need to compile.
if [[ -s ${1} && ( ! -s ${1}.zwc || ${1} -nt ${1}.zwc) ]]; then # These jobs are asynchronous, and will not impact the interactive shell
# needs zcomplie zcompare() {
zcompile ${1} if [[ -s ${1} && ( ! -s ${1}.zwc || ${1} -nt ${1}.zwc) ]]; then
return 0 # needs zcomplie
else zcompile ${1}
# no need to zcompile return 0
return 1 else
fi # no need to zcompile
} return 1
fi
}
# These jobs are asynchronous, and will not impact the interactive shell
{
# First, we will zcompile the completion cache, if it exists. Siginificant speedup. # First, we will zcompile the completion cache, if it exists. Siginificant speedup.
zcompare ${ZDOTDIR:-${HOME}}/.zcompdump zcompare ${ZDOTDIR:-${HOME}}/.zcompdump
@ -36,36 +35,30 @@ local zcompare() {
zcompare ${ZDOTDIR:-${HOME}}/.zim/modules/completion/init.zsh zcompare ${ZDOTDIR:-${HOME}}/.zim/modules/completion/init.zsh
zcompare ${ZDOTDIR:-${HOME}}/.zim/modules/custom/init.zsh zcompare ${ZDOTDIR:-${HOME}}/.zim/modules/custom/init.zsh
# Then, we should zcompile the 'heavy' modules where possible. # Then, we should zcompile the 'heavy' modules where possible.
# This includes syntax-highlighting and completion. # This includes syntax-highlighting and completion.
# Other modules may be added to this list at a later date. # Other modules may be added to this list at a later date.
function { zim=${ZDOTDIR:-${HOME}}/.zim
# use of anonymous function for setopt extended_glob setopt EXTENDED_GLOB
local zim=${ZDOTDIR:-${HOME}}/.zim #
setopt EXTENDED_GLOB # syntax-highlighting zcompile
#
if [[ -d ${zim}/modules/syntax-highlighting/external/highlighters ]]; then
# compile the highlighters
for file in ${zim}/modules/syntax-highlighting/external/highlighters/**/*.zsh; do
zcompare ${file}
done
# compile the main file
zcompare ${zim}/modules/syntax-highlighting/external/zsh-syntax-highlighting.zsh
fi
# #
# syntax-highlighting zcompile # zsh-histery-substring-search zcompile
# #
if [[ -d ${zim}/modules/syntax-highlighting/external/highlighters ]]; then if [[ -s ${zim}/modules/history-substring-search/external/zsh-history-substring-search.zsh ]]; then
# compile the highlighters zcompare ${zim}/modules/history-substring-search/external/zsh-history-substring-search.zsh
for file in ${zim}/modules/syntax-highlighting/external/highlighters/**/*.zsh; do fi
zcompare ${file}
done
# compile the main file
zcompare ${zim}/modules/syntax-highlighting/external/zsh-syntax-highlighting.zsh
fi
#
# zsh-histery-substring-search zcompile
#
if [[ -s ${zim}/modules/history-substring-search/external/zsh-history-substring-search.zsh ]]; then
zcompare ${zim}/modules/history-substring-search/external/zsh-history-substring-search.zsh
fi
}
} &! ) &!
unfunction zcompare