lix-project/lix-installer
16
4
Fork 4
Code Issues 23 Code Review (Gerrit) Projects Activity

bugfix: Let Mac users specify encryption directly (#546)

Browse source
This commit is contained in:
Ana Hobden 2023-06-30 12:43:02 -07:00 committed by GitHub
parent 3586457624
commit 9c915b3f6a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/planner/macos.rs
View file

@ -108,25 +108,26 @@ impl Planner for Macos {
}, },
}; };
let encrypt = if self.encrypt == None { let encrypt = match self.encrypt {
let output = Command::new("/usr/bin/fdesetup") Some(choice) => choice,
.arg("isactive") None => {
.stdout(std::process::Stdio::null()) let output = Command::new("/usr/bin/fdesetup")
.stderr(std::process::Stdio::null()) .arg("isactive")
.process_group(0) .stdout(std::process::Stdio::null())
.output() .stderr(std::process::Stdio::null())
.await .process_group(0)
.map_err(|e| PlannerError::Custom(Box::new(e)))?; .output()
.await
.map_err(|e| PlannerError::Custom(Box::new(e)))?;
let stdout = String::from_utf8_lossy(&output.stdout); let stdout = String::from_utf8_lossy(&output.stdout);
let stdout_trimmed = stdout.trim(); let stdout_trimmed = stdout.trim();
if stdout_trimmed == "true" { if stdout_trimmed == "true" {
true true
} else { } else {
false false
} }
} else { },
false
}; };
Ok(vec![ Ok(vec![