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

Removed unnecessary map call in bash PathBuf (#168)

Browse Source
This commit is contained in:
Elton Lika
2019-06-13 13:47:12 +02:00
committed by Roey Darwish Dror
parent cb180d9c01
commit 8428c4d21d
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,7 +86,7 @@ pub fn run_pearl(run_type: RunType) -> Result<(), Error> {
} }
pub fn run_sdkman(base_dirs: &BaseDirs, cleanup: bool, run_type: RunType) -> Result<(), Error> { pub fn run_sdkman(base_dirs: &BaseDirs, cleanup: bool, run_type: RunType) -> Result<(), Error> {
let bash_path = require("bash").map(|p| format!("{}", &p.display()))?; let bash = require("bash")?;
let sdkman_init_path = env::var("SDKMAN_DIR") let sdkman_init_path = env::var("SDKMAN_DIR")
.map(PathBuf::from) .map(PathBuf::from)
@@ -100,32 +100,29 @@ pub fn run_sdkman(base_dirs: &BaseDirs, cleanup: bool, run_type: RunType) -> Res
let cmd_selfupdate = format!("source {} && sdk selfupdate", &sdkman_init_path); let cmd_selfupdate = format!("source {} && sdk selfupdate", &sdkman_init_path);
run_type run_type
.execute(&bash_path) .execute(&bash)
.args(&["-c", cmd_selfupdate.as_str()]) .args(&["-c", cmd_selfupdate.as_str()])
.check_run()?; .check_run()?;
let cmd_update = format!("source {} && sdk update", &sdkman_init_path); let cmd_update = format!("source {} && sdk update", &sdkman_init_path);
run_type run_type.execute(&bash).args(&["-c", cmd_update.as_str()]).check_run()?;
.execute(&bash_path)
.args(&["-c", cmd_update.as_str()])
.check_run()?;
let cmd_upgrade = format!("source {} && sdk upgrade", &sdkman_init_path); let cmd_upgrade = format!("source {} && sdk upgrade", &sdkman_init_path);
run_type run_type
.execute(&bash_path) .execute(&bash)
.args(&["-c", cmd_upgrade.as_str()]) .args(&["-c", cmd_upgrade.as_str()])
.check_run()?; .check_run()?;
if cleanup { if cleanup {
let cmd_flush_archives = format!("source {} && sdk flush archives", &sdkman_init_path); let cmd_flush_archives = format!("source {} && sdk flush archives", &sdkman_init_path);
run_type run_type
.execute(&bash_path) .execute(&bash)
.args(&["-c", cmd_flush_archives.as_str()]) .args(&["-c", cmd_flush_archives.as_str()])
.check_run()?; .check_run()?;
let cmd_flush_temp = format!("source {} && sdk flush temp", &sdkman_init_path); let cmd_flush_temp = format!("source {} && sdk flush temp", &sdkman_init_path);
run_type run_type
.execute(&bash_path) .execute(&bash)
.args(&["-c", cmd_flush_temp.as_str()]) .args(&["-c", cmd_flush_temp.as_str()])
.check_run()?; .check_run()?;
} }