Skip to content

Commit

Permalink
Rename at-scriptdir project argument to at-script
Browse files Browse the repository at this point in the history
  • Loading branch information
oxinabox committed Feb 16, 2024
1 parent aecd8fd commit 3cde0ea
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ difference between defining a `main` function and executing the code directly at
* The `--compiled-modules` and `--pkgimages` flags can now be set to `existing`, which will
cause Julia to consider loading existing cache files, but not to create new ones ([#50586]
and [#52573]).
* The `--project` argument now accepts `@script` to give a path to a directory with a Project.toml relative to the passed script file. E.g. `--project=@script` for the same directory or `--project=@script/foo` for the `foo` subdirectory. ([#50864] and [#53352])

Multi-threading changes
-----------------------
Expand Down
4 changes: 2 additions & 2 deletions base/initdefs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ function load_path_expand(env::AbstractString)::Union{String, Nothing}
env == "@" && return active_project(false)
env == "@." && return current_project()
env == "@stdlib" && return Sys.STDLIB
if startswith(env, "@scriptdir")
if startswith(env, "@script")
if @isdefined(PROGRAM_FILE)
dir = dirname(PROGRAM_FILE)
else
Expand All @@ -283,7 +283,7 @@ function load_path_expand(env::AbstractString)::Union{String, Nothing}
end
dir = dirname(ARGS[1])
end
return abspath(replace(env, "@scriptdir" => dir))
return abspath(replace(env, :wq"@script" => dir))
end
env = replace(env, '#' => VERSION.major, count=1)
env = replace(env, '#' => VERSION.minor, count=1)
Expand Down

0 comments on commit 3cde0ea

Please sign in to comment.