Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
oh-my-zsh
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
github
oh-my-zsh
Commits
8ae37313
Unverified
Commit
8ae37313
authored
Dec 21, 2021
by
Marc Cornellà
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(cli): respect `ZDOTDIR` in plugin/theme change commands (#10520)
Fixes #10520
parent
a1ec96d1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
26 additions
and
23 deletions
+26
-23
cli.zsh
lib/cli.zsh
+26
-23
No files found.
lib/cli.zsh
View file @
8ae37313
...
...
@@ -276,9 +276,10 @@ multi == 1 && length(\$0) > 0 {
{ print
\$
0 }
"
awk
"
$awk_script
"
~/.zshrc
>
~/.zshrc.new
\
&&
command mv
-f
~/.zshrc ~/.zshrc.bck
\
&&
command mv
-f
~/.zshrc.new ~/.zshrc
local
zdot
=
"
${
ZDOTDIR
:-
$HOME
}
"
awk
"
$awk_script
"
"
$zdot
/.zshrc"
>
"
$zdot
/.zshrc.new"
\
&&
command mv
-f
"
$zdot
/.zshrc"
"
$zdot
/.zshrc.bck"
\
&&
command mv
-f
"
$zdot
/.zshrc.new"
"
$zdot
/.zshrc"
# Exit if the new .zshrc file wasn't created correctly
[[
$?
-eq
0
]]
||
{
...
...
@@ -288,10 +289,10 @@ multi == 1 && length(\$0) > 0 {
}
# Exit if the new .zshrc file has syntax errors
if
!
zsh
-n
~/.zshrc
;
then
_omz::log error
"broken syntax in
~/.zshrc
. Rolling back changes..."
command mv
-f
~/.zshrc ~/.zshrc.new
command mv
-f
~/.zshrc.bck ~/.zshrc
if
!
zsh
-n
"
$zdot
/.zshrc"
;
then
_omz::log error
"broken syntax in
'"
${
zdot
/#
$HOME
/\~
}
/.zshrc
"'
. Rolling back changes..."
command mv
-f
"
$zdot
/.zshrc"
"
$zdot
/.zshrc.new"
command mv
-f
"
$zdot
/.zshrc.bck"
"
$zdot
/.zshrc"
return
1
fi
...
...
@@ -351,9 +352,10 @@ multi == 1 && /^[^#]*\)/ {
{ print
\$
0 }
"
awk
"
$awk_script
"
~/.zshrc
>
~/.zshrc.new
\
&&
command mv
-f
~/.zshrc ~/.zshrc.bck
\
&&
command mv
-f
~/.zshrc.new ~/.zshrc
local
zdot
=
"
${
ZDOTDIR
:-
$HOME
}
"
awk
"
$awk_script
"
"
$zdot
/.zshrc"
>
"
$zdot
/.zshrc.new"
\
&&
command mv
-f
"
$zdot
/.zshrc"
"
$zdot
/.zshrc.bck"
\
&&
command mv
-f
"
$zdot
/.zshrc.new"
"
$zdot
/.zshrc"
# Exit if the new .zshrc file wasn't created correctly
[[
$?
-eq
0
]]
||
{
...
...
@@ -363,10 +365,10 @@ multi == 1 && /^[^#]*\)/ {
}
# Exit if the new .zshrc file has syntax errors
if
!
zsh
-n
~/.zshrc
;
then
_omz::log error
"broken syntax in
~/.zshrc
. Rolling back changes..."
command mv
-f
~/.zshrc ~/.zshrc.new
command mv
-f
~/.zshrc.bck ~/.zshrc
if
!
zsh
-n
"
$zdot
/.zshrc"
;
then
_omz::log error
"broken syntax in
'"
${
zdot
/#
$HOME
/\~
}
/.zshrc
"'
. Rolling back changes..."
command mv
-f
"
$zdot
/.zshrc"
"
$zdot
/.zshrc.new"
command mv
-f
"
$zdot
/.zshrc.bck"
"
$zdot
/.zshrc"
return
1
fi
...
...
@@ -698,17 +700,18 @@ END {
}
'
awk
"
$awk_script
"
~/.zshrc
>
~/.zshrc.new
\
local
zdot
=
"
${
ZDOTDIR
:-
$HOME
}
"
awk
"
$awk_script
"
"
$zdot
/.zshrc"
>
"
$zdot
/.zshrc.new"
\
||
{
# Prepend ZSH_THEME= line to .zshrc if it doesn't exist
cat
<<
EOF
ZSH_THEME="
$1
" # set by \`omz\`
EOF
cat
~/.zshrc
}
>
~/.zshrc.new
\
&&
command mv
-f
~/.zshrc ~/.zshrc.bck
\
&&
command mv
-f
~/.zshrc.new ~/.zshrc
cat
"
$zdot
/.zshrc"
}
>
"
$zdot
/.zshrc.new"
\
&&
command mv
-f
"
$zdot
/.zshrc"
"
$zdot
/.zshrc.bck"
\
&&
command mv
-f
"
$zdot
/.zshrc.new"
"
$zdot
/.zshrc"
# Exit if the new .zshrc file wasn't created correctly
[[
$?
-eq
0
]]
||
{
...
...
@@ -718,10 +721,10 @@ EOF
}
# Exit if the new .zshrc file has syntax errors
if
!
zsh
-n
~/.zshrc
;
then
_omz::log error
"broken syntax in
~/.zshrc
. Rolling back changes..."
command mv
-f
~/.zshrc ~/.zshrc.new
command mv
-f
~/.zshrc.bck ~/.zshrc
if
!
zsh
-n
"
$zdot
/.zshrc"
;
then
_omz::log error
"broken syntax in
'"
${
zdot
/#
$HOME
/\~
}
/.zshrc
"'
. Rolling back changes..."
command mv
-f
"
$zdot
/.zshrc"
"
$zdot
/.zshrc.new"
command mv
-f
"
$zdot
/.zshrc.bck"
"
$zdot
/.zshrc"
return
1
fi
...
...
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