forked from lix-project/lix-installer
Merge branch 'main' into hoverbear/ds-436-tidy-up-plan-install-ux
This commit is contained in:
commit
fb70f9d21b
|
@ -40,3 +40,7 @@ impl CommandExecute for HarmonicCli {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn is_root() -> bool {
|
||||||
|
nix::unistd::getuid() == nix::unistd::Uid::from_raw(0)
|
||||||
|
}
|
||||||
|
|
|
@ -3,7 +3,9 @@ use std::{
|
||||||
process::ExitCode,
|
process::ExitCode,
|
||||||
};
|
};
|
||||||
|
|
||||||
use crate::{action::ActionState, plan::RECEIPT_LOCATION, BuiltinPlanner, InstallPlan, Planner};
|
use crate::{
|
||||||
|
action::ActionState, cli::is_root, plan::RECEIPT_LOCATION, BuiltinPlanner, InstallPlan, Planner,
|
||||||
|
};
|
||||||
use clap::{ArgAction, Parser};
|
use clap::{ArgAction, Parser};
|
||||||
use eyre::{eyre, WrapErr};
|
use eyre::{eyre, WrapErr};
|
||||||
|
|
||||||
|
@ -48,6 +50,12 @@ impl CommandExecute for Install {
|
||||||
explain,
|
explain,
|
||||||
} = self;
|
} = self;
|
||||||
|
|
||||||
|
if !is_root() {
|
||||||
|
return Err(eyre!(
|
||||||
|
"`harmonic install` must be run as `root`, try `sudo harmonic install`"
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
let existing_receipt: Option<InstallPlan> = match Path::new(RECEIPT_LOCATION).exists() {
|
let existing_receipt: Option<InstallPlan> = match Path::new(RECEIPT_LOCATION).exists() {
|
||||||
true => {
|
true => {
|
||||||
let install_plan_string = tokio::fs::read_to_string(&RECEIPT_LOCATION)
|
let install_plan_string = tokio::fs::read_to_string(&RECEIPT_LOCATION)
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
use std::{path::PathBuf, process::ExitCode};
|
use std::{path::PathBuf, process::ExitCode};
|
||||||
|
|
||||||
use crate::{plan::RECEIPT_LOCATION, InstallPlan};
|
use crate::{cli::is_root, plan::RECEIPT_LOCATION, InstallPlan};
|
||||||
use clap::{ArgAction, Parser};
|
use clap::{ArgAction, Parser};
|
||||||
use eyre::WrapErr;
|
use eyre::{eyre, WrapErr};
|
||||||
|
|
||||||
use crate::{cli::CommandExecute, interaction};
|
use crate::{cli::CommandExecute, interaction};
|
||||||
|
|
||||||
|
@ -37,6 +37,12 @@ impl CommandExecute for Uninstall {
|
||||||
explain,
|
explain,
|
||||||
} = self;
|
} = self;
|
||||||
|
|
||||||
|
if !is_root() {
|
||||||
|
return Err(eyre!(
|
||||||
|
"`harmonic install` must be run as `root`, try `sudo harmonic install`"
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
let install_receipt_string = tokio::fs::read_to_string(receipt)
|
let install_receipt_string = tokio::fs::read_to_string(receipt)
|
||||||
.await
|
.await
|
||||||
.wrap_err("Reading receipt")?;
|
.wrap_err("Reading receipt")?;
|
||||||
|
|
Loading…
Reference in a new issue