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
f64cabc7
Unverified
Commit
f64cabc7
authored
Jan 24, 2022
by
Marc Cornellà
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(cli): make sure to run `zsh` command if an alias exists (#9737)
Fixes #9737
parent
8e7c33bf
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
cli.zsh
lib/cli.zsh
+5
-5
No files found.
lib/cli.zsh
View file @
f64cabc7
...
@@ -289,7 +289,7 @@ multi == 1 && length(\$0) > 0 {
...
@@ -289,7 +289,7 @@ multi == 1 && length(\$0) > 0 {
}
}
# Exit if the new .zshrc file has syntax errors
# Exit if the new .zshrc file has syntax errors
if
!
zsh
-n
"
$zdot
/.zshrc"
;
then
if
!
command
zsh
-n
"
$zdot
/.zshrc"
;
then
_omz::log error
"broken syntax in '"
${
zdot
/#
$HOME
/\~
}
/.zshrc
"'. Rolling back changes..."
_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"
"
$zdot
/.zshrc.new"
command mv
-f
"
$zdot
/.zshrc.bck"
"
$zdot
/.zshrc"
command mv
-f
"
$zdot
/.zshrc.bck"
"
$zdot
/.zshrc"
...
@@ -365,7 +365,7 @@ multi == 1 && /^[^#]*\)/ {
...
@@ -365,7 +365,7 @@ multi == 1 && /^[^#]*\)/ {
}
}
# Exit if the new .zshrc file has syntax errors
# Exit if the new .zshrc file has syntax errors
if
!
zsh
-n
"
$zdot
/.zshrc"
;
then
if
!
command
zsh
-n
"
$zdot
/.zshrc"
;
then
_omz::log error
"broken syntax in '"
${
zdot
/#
$HOME
/\~
}
/.zshrc
"'. Rolling back changes..."
_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"
"
$zdot
/.zshrc.new"
command mv
-f
"
$zdot
/.zshrc.bck"
"
$zdot
/.zshrc"
command mv
-f
"
$zdot
/.zshrc.bck"
"
$zdot
/.zshrc"
...
@@ -721,7 +721,7 @@ EOF
...
@@ -721,7 +721,7 @@ EOF
}
}
# Exit if the new .zshrc file has syntax errors
# Exit if the new .zshrc file has syntax errors
if
!
zsh
-n
"
$zdot
/.zshrc"
;
then
if
!
command
zsh
-n
"
$zdot
/.zshrc"
;
then
_omz::log error
"broken syntax in '"
${
zdot
/#
$HOME
/\~
}
/.zshrc
"'. Rolling back changes..."
_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"
"
$zdot
/.zshrc.new"
command mv
-f
"
$zdot
/.zshrc.bck"
"
$zdot
/.zshrc"
command mv
-f
"
$zdot
/.zshrc.bck"
"
$zdot
/.zshrc"
...
@@ -765,9 +765,9 @@ function _omz::update {
...
@@ -765,9 +765,9 @@ function _omz::update {
# Run update script
# Run update script
if
[[
"
$1
"
!=
--unattended
]]
;
then
if
[[
"
$1
"
!=
--unattended
]]
;
then
ZSH
=
"
$ZSH
"
zsh
-f
"
$ZSH
/tools/upgrade.sh"
--interactive
||
return
$?
ZSH
=
"
$ZSH
"
command
zsh
-f
"
$ZSH
/tools/upgrade.sh"
--interactive
||
return
$?
else
else
ZSH
=
"
$ZSH
"
zsh
-f
"
$ZSH
/tools/upgrade.sh"
||
return
$?
ZSH
=
"
$ZSH
"
command
zsh
-f
"
$ZSH
/tools/upgrade.sh"
||
return
$?
fi
fi
# Update last updated file
# Update last updated file
...
...
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