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

Add minor refactorings (#754)

Browse Source
This commit is contained in:
Marcin Puc
2021-09-04 20:01:19 +02:00
committed by GitHub
parent 7db0c03621
commit 1478d079ca
21 changed files with 119 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/steps/remote/ssh.rs
View File

@@ -17,7 +17,7 @@ pub fn ssh_step(ctx: &ExecutionContext, hostname: &str) -> Result<()> {
}
let env = format!("TOPGRADE_PREFIX={}", hostname);
args.extend(&["env", &env, "$SHELL", "-lc", topgrade]);
args.extend(["env", &env, "$SHELL", "-lc", topgrade]);
if ctx.config().yes() {
args.push("-y");
@@ -45,7 +45,7 @@ pub fn ssh_step(ctx: &ExecutionContext, hostname: &str) -> Result<()> {
}
let env = format!("TOPGRADE_PREFIX={}", hostname);
args.extend(&["env", &env, "$SHELL", "-lc", topgrade]);
args.extend(["env", &env, "$SHELL", "-lc", topgrade]);
if ctx.config().yes() {
args.push("-y");

6
src/steps/remote/vagrant.rs
View File

@@ -110,7 +110,7 @@ impl<'a> TemporaryPowerOn<'a> {
ctx.run_type()
.execute(vagrant)
.args(&[subcommand, &vagrant_box.name])
.args([subcommand, &vagrant_box.name])
.current_dir(vagrant_box.path.clone())
.check_run()?;
Ok(TemporaryPowerOn {
@@ -137,7 +137,7 @@ impl<'a> Drop for TemporaryPowerOn<'a> {
self.ctx
.run_type()
.execute(self.vagrant)
.args(&[subcommand, &self.vagrant_box.name])
.args([subcommand, &self.vagrant_box.name])
.current_dir(self.vagrant_box.path.clone())
.check_run()
.ok();
@@ -195,6 +195,6 @@ pub fn topgrade_vagrant_box(ctx: &ExecutionContext, vagrant_box: &VagrantBox) ->
ctx.run_type()
.execute(&vagrant.path)
.current_dir(&vagrant_box.path)
.args(&["ssh", "-c", &command])
.args(["ssh", "-c", &command])
.check_run()
}