@@ -295,8 +295,8 @@ function exec_options(opts)
295
295
invokelatest (Main. Distributed. process_opts, opts)
296
296
end
297
297
298
- # load ~/.juliarc file
299
- startup && load_juliarc ()
298
+ # load ~/.julia/config/startup.jl file
299
+ startup && load_julia_startup ()
300
300
301
301
if repl || is_interactive
302
302
# load interactive-only libraries
@@ -345,16 +345,16 @@ function exec_options(opts)
345
345
nothing
346
346
end
347
347
348
- function load_juliarc ()
349
- # If the user built us with a specific Base.SYSCONFDIR, check that location first for a juliarc .jl file
348
+ function load_julia_startup ()
349
+ # If the user built us with a specific Base.SYSCONFDIR, check that location first for a startup .jl file
350
350
# If it is not found, then continue on to the relative path based on Sys.BINDIR
351
- if ! isempty (Base. SYSCONFDIR) && isfile (joinpath (Sys. BINDIR, Base. SYSCONFDIR, " julia" , " juliarc .jl" ))
352
- include (Main, abspath (Sys. BINDIR, Base. SYSCONFDIR, " julia" , " juliarc .jl" ))
351
+ if ! isempty (Base. SYSCONFDIR) && isfile (joinpath (Sys. BINDIR, Base. SYSCONFDIR, " julia" , " startup .jl" ))
352
+ include (Main, abspath (Sys. BINDIR, Base. SYSCONFDIR, " julia" , " startup .jl" ))
353
353
else
354
- include_ifexists (Main, abspath (Sys. BINDIR, " .." , " etc" , " julia" , " juliarc .jl" ))
354
+ include_ifexists (Main, abspath (Sys. BINDIR, " .." , " etc" , " julia" , " startup .jl" ))
355
355
end
356
- include_ifexists (Main, abspath (homedir (), " .juliarc .jl" ))
357
- nothing
356
+ include_ifexists (Main, abspath (homedir (), " .julia " , " config " , " startup .jl" ))
357
+ return nothing
358
358
end
359
359
360
360
const repl_hooks = []
@@ -364,8 +364,8 @@ const repl_hooks = []
364
364
365
365
Register a one-argument function to be called before the REPL interface is initialized in
366
366
interactive sessions; this is useful to customize the interface. The argument of `f` is the
367
- REPL object. This function should be called from within the `.juliarc .jl` initialization
368
- file.
367
+ REPL object. This function should be called from within the `.julia/config/startup .jl`
368
+ initialization file.
369
369
"""
370
370
atreplinit (f:: Function ) = (pushfirst! (repl_hooks, f); nothing )
371
371
@@ -400,7 +400,7 @@ function run_main_repl(interactive::Bool, quiet::Bool, banner::Bool, history_fil
400
400
active_repl = REPL. LineEditREPL (term, have_color, true )
401
401
active_repl. history_file = history_file
402
402
end
403
- # Make sure any displays pushed in .juliarc .jl ends up above the
403
+ # Make sure any displays pushed in .julia/config/startup .jl ends up above the
404
404
# REPLDisplay
405
405
pushdisplay (REPL. REPLDisplay (active_repl))
406
406
_atreplinit (active_repl)
0 commit comments