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

No need to run which in WSL (fix #694) (#707)

Browse Source 
* No need to run which in WSL (fix #694)

* clippy
This commit is contained in:
Roey Darwish Dror
2021-05-10 09:40:23 +03:00
committed by GitHub
parent 54055a5e10
commit ac4c23929e
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/steps/os/windows.rs
View File

@@ -1,9 +1,9 @@
use crate::execution_context::ExecutionContext; use crate::execution_context::ExecutionContext;
use crate::executor::{CommandExt, RunType}; use crate::executor::RunType;
use crate::powershell; use crate::powershell;
use crate::steps::git::Repositories;
use crate::terminal::print_separator; use crate::terminal::print_separator;
use crate::utils::require; use crate::utils::require;
use crate::{error::SkipStep, steps::git::Repositories};
use anyhow::Result; use anyhow::Result;
use log::debug; use log::debug;
use std::convert::TryFrom; use std::convert::TryFrom;
@@ -52,15 +52,8 @@ pub fn run_scoop(cleanup: bool, run_type: RunType) -> Result<()> {
pub fn run_wsl_topgrade(ctx: &ExecutionContext) -> Result<()> { pub fn run_wsl_topgrade(ctx: &ExecutionContext) -> Result<()> {
let wsl = require("wsl")?; let wsl = require("wsl")?;
let topgrade = Command::new(&wsl)
.args(&["bash", "-lc", "which topgrade"])
.check_output()
.map_err(|_| SkipStep(String::from("Could not find Topgrade installed in WSL")))?;
let mut command = ctx.run_type().execute(&wsl); let mut command = ctx.run_type().execute(&wsl);
command command.args(&["bash", "-lc"]).arg("TOPGRADE_PREFIX=WSL exec topgrade");
.args(&["bash", "-c"])
.arg(format!("TOPGRADE_PREFIX=WSL exec {}", topgrade));
if ctx.config().yes() { if ctx.config().yes() {
command.arg("-y"); command.arg("-y");