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
026e4e49
Commit
026e4e49
authored
Jan 16, 2019
by
Jackson Delahunt
Committed by
Marc Cornellà
Jan 15, 2019
Browse files
installer: make TEST_CURRENT_SHELL use basename (#7514)
Fixes #7492
parent
9329efd2
Changes
1
Hide whitespace changes
Inline
Side-by-side
tools/install.sh
View file @
026e4e49
...
@@ -79,7 +79,7 @@ main() {
...
@@ -79,7 +79,7 @@ main() {
mv
-f
~/.zshrc-omztemp ~/.zshrc
mv
-f
~/.zshrc-omztemp ~/.zshrc
# If this user's login shell is not already "zsh", attempt to switch.
# If this user's login shell is not already "zsh", attempt to switch.
TEST_CURRENT_SHELL
=
$(
expr
"
$SHELL
"
:
'.*/\(.*\)'
)
TEST_CURRENT_SHELL
=
$(
basename
"
$SHELL
"
)
if
[
"
$TEST_CURRENT_SHELL
"
!=
"zsh"
]
;
then
if
[
"
$TEST_CURRENT_SHELL
"
!=
"zsh"
]
;
then
# If this platform provides a "chsh" command (not Cygwin), do it, man!
# If this platform provides a "chsh" command (not Cygwin), do it, man!
if
hash
chsh
>
/dev/null 2>&1
;
then
if
hash
chsh
>
/dev/null 2>&1
;
then
...
...
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