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

Show banner again by default #429

Merged
merged 1 commit into from
May 1, 2020
Merged

Show banner again by default #429

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 27 additions & 19 deletions src/GAP.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,37 @@ end
function run_it()
gaproots = abspath(joinpath(@__DIR__, "..")) * ";" * sysinfo["GAP_LIB_DIR"]
cmdline_options = ["", "-l", gaproots, "-T", "-A", "--nointeract", "-m", "1000m"]
if get(ENV, "GAP_SHOW_BANNER", "false") != "true"
if haskey(ENV, "GAP_SHOW_BANNER")
show_banner = ENV["GAP_SHOW_BANNER"] == "true"
else
show_banner = isinteractive() &&
!any(x->x.name in ["Oscar"], keys(Base.package_locks))
end

if !show_banner
# Do not show the main GAP banner by default.
push!(cmdline_options, "-b")
end
initialize(cmdline_options)

if !show_banner
# Leave it to GAP's `LoadPackage` whether package banners are shown.
# Note that a second argument `false` of this function suppresses the
# package banner,
# but no package banners can be shown if the `-b` option is `true`.
gap_module = @__MODULE__
Base.MainInclude.eval(
:(
begin
record = $gap_module.Globals.GAPInfo
record.CommandLineOptions =
$gap_module.Globals.ShallowCopy(record.CommandLineOptions)
record.CommandLineOptions.b = false
$gap_module.Globals.MakeImmutable(record.CommandLineOptions)
end
),
)
end
end

function __init__()
Expand All @@ -183,24 +209,6 @@ function __init__()
run_it()
end
register_GapObj()

if get(ENV, "GAP_SHOW_BANNER", "false") != "true"
# Leave it to GAP's `LoadPackage` whether package banners are shown.
# Note that a second argument `false` of this function suppresses the
# package banner,
# but no package banners can be shown if the `-b` option is `true`.
Base.MainInclude.eval(
:(
begin
record = $gap_module.Globals.GAPInfo
record.CommandLineOptions =
$gap_module.Globals.ShallowCopy(record.CommandLineOptions)
record.CommandLineOptions.b = false
$gap_module.Globals.MakeImmutable(record.CommandLineOptions)
end
),
)
end
end

function gap_exe()
Expand Down