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
a54148a4
Unverified
Commit
a54148a4
authored
Oct 04, 2021
by
Marc Cornellà
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(init): rename function `f` due to clash with `f` alias (#10260)
Fixes #10260
parent
714399a7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
oh-my-zsh.sh
oh-my-zsh.sh
+8
-8
No files found.
oh-my-zsh.sh
View file @
a54148a4
...
@@ -2,14 +2,14 @@
...
@@ -2,14 +2,14 @@
[
-n
"
$ZSH_VERSION
"
]
||
{
[
-n
"
$ZSH_VERSION
"
]
||
{
# ANSI formatting function (\033[<code>m)
# ANSI formatting function (\033[<code>m)
# 0: reset, 1: bold, 4: underline, 22: no bold, 24: no underline, 31: red, 33: yellow
# 0: reset, 1: bold, 4: underline, 22: no bold, 24: no underline, 31: red, 33: yellow
f
()
{
omz_
f
()
{
[
$#
-gt
0
]
||
return
[
$#
-gt
0
]
||
return
IFS
=
";"
printf
"
\0
33[%sm"
$*
IFS
=
";"
printf
"
\0
33[%sm"
$*
}
}
# If stdout is not a terminal ignore all formatting
# If stdout is not a terminal ignore all formatting
[
-t
1
]
||
f
()
{
:
;
}
[
-t
1
]
||
omz_
f
()
{
:
;
}
ptree
()
{
omz_
ptree
()
{
# Get process tree of the current process
# Get process tree of the current process
pid
=
$$
;
pids
=
"
$pid
"
pid
=
$$
;
pids
=
"
$pid
"
while
[
${
pid
-0
}
-ne
1
]
&&
ppid
=
$(
ps
-e
-o
pid,ppid |
awk
"
\$
1 ==
$pid
{ print
\$
2 }"
)
;
do
while
[
${
pid
-0
}
-ne
1
]
&&
ppid
=
$(
ps
-e
-o
pid,ppid |
awk
"
\$
1 ==
$pid
{ print
\$
2 }"
)
;
do
...
@@ -28,11 +28,11 @@
...
@@ -28,11 +28,11 @@
{
{
shell
=
$(
ps
-o
pid,comm |
awk
"
\$
1 ==
$$
{ print
\$
2 }"
)
shell
=
$(
ps
-o
pid,comm |
awk
"
\$
1 ==
$$
{ print
\$
2 }"
)
printf
"
$(
f 1 31
)
Error:
$(
f 22
)
Oh My Zsh can't be loaded from:
$(
f 1
)${
shell
}$(
f 22
)
. "
printf
"
$(
omz_f 1 31
)
Error:
$(
omz_f 22
)
Oh My Zsh can't be loaded from:
$(
omz_f 1
)${
shell
}$(
omz_
f 22
)
. "
printf
"You need to run
$(
f 1
)
zsh
$(
f 22
)
instead.
$(
f 0
)
\n
"
printf
"You need to run
$(
omz_f 1
)
zsh
$(
omz_f 22
)
instead.
$(
omz_
f 0
)
\n
"
printf
"
$(
f 33
)
Here's the process tree:
$(
f 22
)
\n\n
"
printf
"
$(
omz_f 33
)
Here's the process tree:
$(
omz_
f 22
)
\n\n
"
ptree
omz_
ptree
printf
"
$(
f 0
)
\n
"
printf
"
$(
omz_
f 0
)
\n
"
}
>
&2
}
>
&2
return
1
return
1
...
...
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