admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure selfupdate is enabled for SDKMAN! (#954)

Browse Source 
* Ensure `selfupdate` is enabled for SDKMAN!

This subcommand is unavailable when the `sdkman_selfupdate_feature`
option is disabled, as is the case when SDKMAN! is installed via
Homebrew.

https://github.com/sdkman/sdkman-cli/pull/1042

* Fix macOS build; simplify

Co-authored-by: Roey Darwish Dror <roey.ghost@gmail.com>
This commit is contained in:
Quinton Cloutier
2022-06-18 08:29:37 -03:00
committed by GitHub
parent d864199c67
commit f390f2edbe
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@@ -41,6 +41,7 @@ notify-rust = "4.5.0"
[target.'cfg(unix)'.dependencies] [target.'cfg(unix)'.dependencies]
nix = "0.24.1" nix = "0.24.1"
rust-ini = "0.18.0"
self_update_crate = { version = "0.30.0", default-features = false, optional = true, package = "self_update", features = ["archive-tar", "compression-flate2", "rustls"] } self_update_crate = { version = "0.30.0", default-features = false, optional = true, package = "self_update", features = ["archive-tar", "compression-flate2", "rustls"] }
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
@@ -48,9 +49,6 @@ self_update_crate = { version = "0.30.0", default-features = false, optional = t
winapi = "0.3.9" winapi = "0.3.9"
parselnk = "0.1.0" parselnk = "0.1.0"
[target.'cfg(target_os = "linux")'.dependencies]
rust-ini = "0.18.0"
[profile.release] [profile.release]
lto = true lto = true

26
src/steps/os/unix.rs
View File

@@ -8,6 +8,7 @@ use crate::utils::{require, PathExt};
use crate::Step; use crate::Step;
use anyhow::Result; use anyhow::Result;
use directories::BaseDirs; use directories::BaseDirs;
use ini::Ini;
use log::debug; use log::debug;
use std::fs; use std::fs;
use std::os::unix::fs::MetadataExt; use std::os::unix::fs::MetadataExt;
@@ -343,11 +344,26 @@ pub fn run_sdkman(base_dirs: &BaseDirs, cleanup: bool, run_type: RunType) -> Res
print_separator("SDKMAN!"); print_separator("SDKMAN!");
let cmd_selfupdate = format!("source {} && sdk selfupdate", &sdkman_init_path); let sdkman_config_path = env::var("SDKMAN_DIR")
run_type .map(PathBuf::from)
.execute(&bash) .unwrap_or_else(|_| base_dirs.home_dir().join(".sdkman"))
.args(&["-c", cmd_selfupdate.as_str()]) .join("etc")
.check_run()?; .join("config")
.require()?;
let sdkman_config = Ini::load_from_file(sdkman_config_path)?;
let selfupdate_enabled = sdkman_config
.general_section()
.get("sdkman_selfupdate_feature")
.unwrap_or("false");
if selfupdate_enabled == "true" {
let cmd_selfupdate = format!("source {} && sdk selfupdate", &sdkman_init_path);
run_type
.execute(&bash)
.args(&["-c", cmd_selfupdate.as_str()])
.check_run()?;
}
let cmd_update = format!("source {} && sdk update", &sdkman_init_path); let cmd_update = format!("source {} && sdk update", &sdkman_init_path);
run_type.execute(&bash).args(&["-c", cmd_update.as_str()]).check_run()?; run_type.execute(&bash).args(&["-c", cmd_update.as_str()]).check_run()?;