diff --git a/locales/app.yml b/locales/app.yml index 06ca70d9..22765e98 100644 --- a/locales/app.yml +++ b/locales/app.yml @@ -398,14 +398,6 @@ _version: 2 zh_CN: "Topgrade %{version_str} 破坏性更改" zh_TW: "Topgrade %{version_str} 重大更改" de: "Topgrade %{version_str} Inkompatible Änderungen" -"Path {path} expanded to {expanded}": - en: "Path %{path} expanded to %{expanded}" - lt: "Kelias %{path} išplėstas į %{expanded}" - es: "Ruta %{path} expandida a %{expanded}" - fr: "Le chemin %{path} a été transformé en %{expanded}" - zh_CN: "已扩展 %{path} 至 %{expanded}" - zh_TW: "已擴展 %{path} 至 %{expanded}" - de: "Pfad %{path} erweitert zu %{expanded}" "Path {path} doesn't exist": en: "Path %{path} doesn't exist" lt: "Kelias %{path} neegzistuoja" diff --git a/src/config.rs b/src/config.rs index 21e46e48..0eb9b2a5 100644 --- a/src/config.rs +++ b/src/config.rs @@ -15,7 +15,6 @@ use indexmap::IndexMap; use merge::Merge; use regex::Regex; use regex_split::RegexSplit; -use rust_i18n::t; use serde::Deserialize; use strum::IntoEnumIterator; use tracing::{debug, error}; @@ -659,17 +658,6 @@ impl ConfigFile { } } - if let Some(paths) = result.git.as_mut().and_then(|git| git.repos.as_mut()) { - for path in paths.iter_mut() { - let expanded = shellexpand::tilde::<&str>(&path.as_ref()).into_owned(); - debug!( - "{}", - t!("Path {path} expanded to {expanded}", path = path, expanded = expanded) - ); - *path = expanded; - } - } - debug!("Loaded configuration: {:?}", result); Ok(result) } diff --git a/src/steps/git.rs b/src/steps/git.rs index 6621959a..7c2e05cf 100644 --- a/src/steps/git.rs +++ b/src/steps/git.rs @@ -93,7 +93,7 @@ pub fn run_git_pull(ctx: &ExecutionContext) -> Result<()> { // Handle user-defined repos if let Some(custom_git_repos) = config.git_repos() { for git_repo in custom_git_repos { - repos.glob_insert(git_repo); + repos.glob_insert(&shellexpand::tilde(git_repo)); } }