1
0
Fork 0
mirror of https://codeberg.org/icewind/haze.git synced 2026-06-03 17:14:08 +02:00

add shell command

This commit is contained in:
Robin Appelman 2022-03-09 19:34:43 +01:00
commit 13fde5a378
3 changed files with 55 additions and 1 deletions

View file

@ -50,6 +50,10 @@ pub enum HazeArgs {
options: CloudOptions,
args: Vec<String>,
},
Shell {
options: CloudOptions,
command: Vec<String>,
},
}
#[derive(Debug, Clone, Eq, PartialEq)]
@ -192,6 +196,12 @@ impl HazeArgs {
.ok_or_else(|| Report::msg("No path provided"))?;
Ok(HazeArgs::Fmt { path })
}
HazeCommand::Shell => {
let mut args = args.peekable();
let options = CloudOptions::parse(&mut args)?;
let command = args.map(S::into).collect();
Ok(HazeArgs::Shell { options, command })
}
}
}
}
@ -210,6 +220,7 @@ pub enum HazeCommand {
Open,
Fmt,
Integration,
Shell,
}
impl FromStr for HazeCommand {
@ -230,6 +241,7 @@ impl FromStr for HazeCommand {
"fmt" => Ok(HazeCommand::Fmt),
"format" => Ok(HazeCommand::Fmt),
"integration" => Ok(HazeCommand::Integration),
"shell" => Ok(HazeCommand::Shell),
_ => Err(Report::msg(format!("Unknown command: {}", s))),
}
}
@ -250,6 +262,7 @@ impl HazeCommand {
HazeCommand::Open => true,
HazeCommand::Fmt => false,
HazeCommand::Integration => false,
HazeCommand::Shell => false,
}
}
}

View file

@ -349,6 +349,39 @@ async fn main() -> Result<()> {
}
cloud.destroy(&mut docker).await?;
}
HazeArgs::Shell { command, options } => {
let cloud = Cloud::create(&mut docker, options, &config).await?;
println!("Waiting for servers to start");
cloud.wait_for_start(&mut docker).await?;
println!("Installing");
if let Err(e) = cloud
.exec(
&mut docker,
vec![
"install",
&config.auto_setup.username,
&config.auto_setup.password,
],
false,
)
.await
{
cloud.destroy(&mut docker).await?;
return Err(e);
}
cloud
.exec(
&mut docker,
if command.is_empty() {
vec!["bash".to_string()]
} else {
command
},
true,
)
.await?;
cloud.destroy(&mut docker).await?;
}
};
Ok(())