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

Use JULIAUP_DEPOT_PATH instead of JULIA_DEPOT_PATH #661

Merged
merged 6 commits into from
Nov 16, 2023
Merged

Use JULIAUP_DEPOT_PATH instead of JULIA_DEPOT_PATH #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
655a560
Use JULIAUP_HOME instead of JULIA_DEPOT_PATH
davidanthoff Jun 23, 2023
3545cc4
Add docs for JULIAUP_HOME
davidanthoff Jun 23, 2023
c784085
Merge branch 'main' into juliaup-home-env-var
davidanthoff Jun 29, 2023
74e2f9a
Change to JULIAUP_DEPOT_PATH
davidanthoff Jun 29, 2023
1a0cf2f
Merge branch 'main' into juliaup-home-env-var
davidanthoff Nov 15, 2023
fc9fa6f
Fix formatting
davidanthoff Nov 16, 2023
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
6 changes: 6 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,12 @@ The Julia launcher `julia` automatically determines which specific version of Ju

The channel is used in the order listed above, using the first available option.

## Path used by Juliaup

Juliaup will by default use the Julia depot at `~/.julia` to store Julia versions and configuration files. This can be changed by setting
the `JULIAUP_DEPOT_PATH` environment variable. Caution: Previous versions of Juliaup used the content of the environment variable
`JULIA_DEPOT_PATH` to locate Juliaup files, the current version changed this behavior and no longer depends on `JULIA_DEPOT_PATH`.

## Juliaup server

Juliaup by default downloads julia binary tarballs from the official server "https://julialang-s3.julialang.org".
Expand Down
44 changes: 11 additions & 33 deletions src/global_paths.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,43 +17,21 @@ pub struct GlobalPaths {
}

fn get_juliaup_home_path() -> Result<PathBuf> {
let entry_sep = if std::env::consts::OS == "windows" {
';'
} else {
':'
};

match std::env::var("JULIA_DEPOT_PATH") {
match std::env::var("JULIAUP_DEPOT_PATH") {
Ok(val) => {
// Note: Docs on JULIA_DEPOT_PATH states that if it exists but is empty, it should
// be interpreted as an empty array. This code instead interprets it as a 1-element
// array of the default path.
// We interpret it differently, because while Julia may work without a DEPOT_PATH,
// Juliaup does not currently, since it must check for new versions.
let mut paths = Vec::<PathBuf>::new();
for segment in val.split(entry_sep) {
// Empty segments resolve to the default first value of
// DEPOT_PATH
let segment_path = if segment.is_empty() {
get_default_juliaup_home_path()?
} else {
PathBuf::from(segment.to_string())
};
paths.push(segment_path);
}
let val = val.trim();

if val.is_empty() {
return get_default_juliaup_home_path();
} else {
let path = PathBuf::from(val);

// First, we try to find any directory which already is initialized by
// Juliaup.
for path in paths.iter() {
let subpath = path.join("juliaup").join("juliaup.json");
if subpath.is_file() {
return Ok(path.join("juliaup"));
if !path.is_absolute() {
return Err(anyhow!("The current value of '{}' for the environment variable JULIAUP_DEPOT_PATH is not an absolute path.", val));
} else {
return Ok(PathBuf::from(val).join("juliaup"));
}
}
// If such a file does not exist, we pick the first segment in JULIA_DEPOT_PATH.
// This is guaranteed to be nonempty due to the properties of str::split.
let first_path = paths.iter().next().unwrap();
return Ok(first_path.join("juliaup"));
}
Err(_) => return get_default_juliaup_home_path(),
}
Expand Down
11 changes: 11 additions & 0 deletions tests/channel_selection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ fn channel_selection() {
.arg("add")
.arg("1.6.7")
.env("JULIA_DEPOT_PATH", depot_dir.path())
.env("JULIAUP_DEPOT_PATH", depot_dir.path())
.assert()
.success()
.stdout("");
Expand All @@ -18,6 +19,7 @@ fn channel_selection() {
.arg("add")
.arg("1.7.3")
.env("JULIA_DEPOT_PATH", depot_dir.path())
.env("JULIAUP_DEPOT_PATH", depot_dir.path())
.assert()
.success()
.stdout("");
Expand All @@ -27,6 +29,7 @@ fn channel_selection() {
.arg("add")
.arg("1.8.5")
.env("JULIA_DEPOT_PATH", depot_dir.path())
.env("JULIAUP_DEPOT_PATH", depot_dir.path())
.assert()
.success()
.stdout("");
Expand All @@ -36,6 +39,7 @@ fn channel_selection() {
.arg("default")
.arg("1.6.7")
.env("JULIA_DEPOT_PATH", depot_dir.path())
.env("JULIAUP_DEPOT_PATH", depot_dir.path())
.assert()
.success()
.stdout("");
Expand All @@ -45,6 +49,7 @@ fn channel_selection() {
.arg("-e")
.arg("print(VERSION)")
.env("JULIA_DEPOT_PATH", depot_dir.path())
.env("JULIAUP_DEPOT_PATH", depot_dir.path())
.assert()
.success()
.stdout("1.6.7");
Expand All @@ -55,6 +60,7 @@ fn channel_selection() {
.arg("-e")
.arg("print(VERSION)")
.env("JULIA_DEPOT_PATH", depot_dir.path())
.env("JULIAUP_DEPOT_PATH", depot_dir.path())
.assert()
.success()
.stdout("1.8.5");
Expand All @@ -64,6 +70,7 @@ fn channel_selection() {
.arg("-e")
.arg("print(VERSION)")
.env("JULIA_DEPOT_PATH", depot_dir.path())
.env("JULIAUP_DEPOT_PATH", depot_dir.path())
.env("JULIAUP_CHANNEL", "1.7.3")
.assert()
.success()
Expand All @@ -75,6 +82,7 @@ fn channel_selection() {
.arg("-e")
.arg("print(VERSION)")
.env("JULIA_DEPOT_PATH", depot_dir.path())
.env("JULIAUP_DEPOT_PATH", depot_dir.path())
.env("JULIAUP_CHANNEL", "1.7.3")
.assert()
.success()
Expand All @@ -88,6 +96,7 @@ fn channel_selection() {
.arg("-e")
.arg("print(VERSION)")
.env("JULIA_DEPOT_PATH", depot_dir.path())
.env("JULIAUP_DEPOT_PATH", depot_dir.path())
.assert()
.failure()
.stderr("ERROR: Invalid Juliaup channel `1.8.6` at command line.\n");
Expand All @@ -97,6 +106,7 @@ fn channel_selection() {
.arg("-e")
.arg("print(VERSION)")
.env("JULIA_DEPOT_PATH", depot_dir.path())
.env("JULIAUP_DEPOT_PATH", depot_dir.path())
.env("JULIAUP_CHANNEL", "1.7.4")
.assert()
.failure()
Expand All @@ -110,6 +120,7 @@ fn channel_selection() {
.arg("-e")
.arg("print(VERSION)")
.env("JULIA_DEPOT_PATH", depot_dir.path())
.env("JULIAUP_DEPOT_PATH", depot_dir.path())
.env("JULIAUP_CHANNEL", "1.7.4")
.assert()
.failure()
Expand Down
2 changes: 2 additions & 0 deletions tests/command_add.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ fn command_add() {
.arg("add")
.arg("1.6.4")
.env("JULIA_DEPOT_PATH", depot_dir.path())
.env("JULIAUP_DEPOT_PATH", depot_dir.path())
.assert()
.success()
.stdout("");
Expand All @@ -19,6 +20,7 @@ fn command_add() {
.arg("-e")
.arg("print(VERSION)")
.env("JULIA_DEPOT_PATH", depot_dir.path())
.env("JULIAUP_DEPOT_PATH", depot_dir.path())
.assert()
.success()
.stdout("1.6.4");
Expand Down
3 changes: 3 additions & 0 deletions tests/command_default.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ fn command_default() {
.arg("add")
.arg("1.6.0")
.env("JULIA_DEPOT_PATH", depot_dir.path())
.env("JULIAUP_DEPOT_PATH", depot_dir.path())
.assert()
.success()
.stdout("");
Expand All @@ -18,6 +19,7 @@ fn command_default() {
.arg("default")
.arg("1.6.0")
.env("JULIA_DEPOT_PATH", depot_dir.path())
.env("JULIAUP_DEPOT_PATH", depot_dir.path())
.assert()
.success()
.stdout("");
Expand All @@ -27,6 +29,7 @@ fn command_default() {
.arg("-e")
.arg("print(VERSION)")
.env("JULIA_DEPOT_PATH", depot_dir.path())
.env("JULIAUP_DEPOT_PATH", depot_dir.path())
.assert()
.success()
.stdout("1.6.0");
Expand Down
1 change: 1 addition & 0 deletions tests/command_initial_setup_from_launcher_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ fn command_initial_setup() {
.unwrap()
.arg("46029ef5-0b73-4a71-bff3-d0d05de42aac")
.env("JULIA_DEPOT_PATH", depot_dir.path())
.env("JULIAUP_DEPOT_PATH", depot_dir.path())
.assert()
.success()
.stdout("");
Expand Down
2 changes: 2 additions & 0 deletions tests/command_list_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ fn command_list() {
.unwrap()
.arg("list")
.env("JULIA_DEPOT_PATH", depot_dir.path())
.env("JULIAUP_DEPOT_PATH", depot_dir.path())
.assert()
.success()
.stdout(predicate::str::starts_with(" Channel").and(predicate::str::contains("release")));
Expand All @@ -20,6 +21,7 @@ fn command_list() {
.unwrap()
.arg("ls")
.env("JULIA_DEPOT_PATH", depot_dir.path())
.env("JULIAUP_DEPOT_PATH", depot_dir.path())
.assert()
.success()
.stdout(predicate::str::starts_with(" Channel").and(predicate::str::contains("release")));
Expand Down
Loading