Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Base.isinteractive() for startup files #42507

Merged
merged 5 commits into from
Oct 7, 2021
Merged

Fix Base.isinteractive() for startup files #42507

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a391659
Fix Base.isinteractive() for startup files
petvana Oct 5, 2021
4c2abdf
Update base/client.jl
petvana Oct 5, 2021
2e3b277
Simplify the code slightly
petvana Oct 5, 2021
e6c5e4a
Improve type inference
petvana Oct 5, 2021
e4034a7
Update base/client.jl
JeffBezanson Oct 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix Base.isinteractive() for startup files
  • Loading branch information
@petvana
petvana committed Oct 5, 2021
commit a3916594e488cf6095c90a1d2a25ccbeefb0efe1
5 changes: 3 additions & 2 deletions base/client.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,9 @@ function exec_options(opts)
invokelatest(Main.Distributed.process_opts, opts)
end

interactiveinput = (repl || is_interactive) && isa(stdin, TTY)
petvana marked this conversation as resolved.
Show resolved Hide resolved
is_interactive |= interactiveinput
JeffBezanson marked this conversation as resolved.
Show resolved Hide resolved

# load ~/.julia/config/startup.jl file
if startup
try
Expand Down Expand Up @@ -299,9 +302,7 @@ function exec_options(opts)
end
repl |= is_interactive::Bool
Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this could be moved higher as well?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

repl is only a local variable and seems not to have any effect before because it is always used as repl || is_interactive::Bool. So I moved it to the following if statement to simplify the code slightly.

if repl
interactiveinput = isa(stdin, TTY)
if interactiveinput
global is_interactive = true
banner = (opts.banner != 0) # --banner!=no
else
banner = (opts.banner == 1) # --banner=yes
Expand Down