Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Ohmyzsh
Commits
0e12ebb4
Commit
0e12ebb4
authored
Jun 02, 2020
by
Marc Cornellà
Browse files
init: use grep for zcompdump metadata check
Closes #8981
parent
93cc3964
Changes
1
Hide whitespace changes
Inline
Side-by-side
oh-my-zsh.sh
View file @
0e12ebb4
...
@@ -62,13 +62,13 @@ if [ -z "$ZSH_COMPDUMP" ]; then
...
@@ -62,13 +62,13 @@ if [ -z "$ZSH_COMPDUMP" ]; then
fi
fi
# Construct zcompdump OMZ metadata
# Construct zcompdump OMZ metadata
zcompdump_metadata
=
"
\
zcompdump_revision
=
"#omz revision:
$(
builtin cd
-q
"
$ZSH
"
;
git rev-parse HEAD 2>/dev/null
)
"
#omz revision:
$(
builtin cd
-q
"
$ZSH
"
;
git rev-parse HEAD 2>/dev/null
)
zcompdump_fpath
=
"#omz fpath:
$fpath
"
#omz fpath:
$fpath
\
"
# Delete the zcompdump file if OMZ zcompdump metadata changed
# Delete the zcompdump file if OMZ zcompdump metadata changed
if
!
cmp
-s
<
(
command grep
'^#omz'
"
$ZSH_COMPDUMP
"
2>/dev/null
)
<
(
echo
"
$zcompdump_metadata
"
)
;
then
if
!
command grep
-q
-Fx
"
$zcompdump_revision
"
"
$ZSH_COMPDUMP
"
2>/dev/null
\
||
!
command grep
-q
-Fx
"
$zcompdump_fpath
"
"
$ZSH_COMPDUMP
"
2>/dev/null
;
then
echo
zcompdump changed
command rm
-f
"
$ZSH_COMPDUMP
"
command rm
-f
"
$ZSH_COMPDUMP
"
zcompdump_refresh
=
1
zcompdump_refresh
=
1
fi
fi
...
@@ -86,10 +86,14 @@ fi
...
@@ -86,10 +86,14 @@ fi
# Append zcompdump metadata if missing
# Append zcompdump metadata if missing
if
((
$zcompdump_refresh
))
;
then
if
((
$zcompdump_refresh
))
;
then
echo
"
\n
$zcompdump_metadata
"
|
tee
-a
"
$ZSH_COMPDUMP
"
&>/dev/null
cat
>>
|
"
$ZSH_COMPDUMP
"
<<
EOF
$zcompdump_revision
$zcompdump_fpath
EOF
fi
fi
unset
zcompdump_
metad
at
a
zcompdump_refresh
unset
zcompdump_
revision zcompdump_fp
at
h
zcompdump_refresh
# Load all of the config files in ~/oh-my-zsh that end in .zsh
# Load all of the config files in ~/oh-my-zsh that end in .zsh
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment