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

Fix composer (fix #173)

Browse Source
This commit is contained in:
Roey Darwish Dror
2019-07-01 08:56:18 +03:00
parent 6ef54929b7
commit 69e9ff693b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/steps/generic.rs
View File

@@ -116,10 +116,10 @@ pub fn run_custom_command(name: &str, command: &str, run_type: RunType) -> Resul
pub fn run_composer_update(base_dirs: &BaseDirs, run_type: RunType) -> Result<(), Error> { pub fn run_composer_update(base_dirs: &BaseDirs, run_type: RunType) -> Result<(), Error> {
let composer = utils::require("composer")?; let composer = utils::require("composer")?;
let composer_home = Command::new(&composer) let composer_home = Command::new(&composer)
.args(&["global", "config", "--absolute", "home"]) .args(&["global", "config", "--absolute", "--quiet", "home"])
.check_output() .check_output()
.map_err(|_| Error::from(ErrorKind::SkipStep)) .map_err(|_| Error::from(ErrorKind::SkipStep))
.map(PathBuf::from) .map(|s| PathBuf::from(s.trim()))
.and_then(PathExt::require)?; .and_then(PathExt::require)?;
if !composer_home.is_descendant_of(base_dirs.home_dir()) { if !composer_home.is_descendant_of(base_dirs.home_dir()) {