From 2cf69a82b7fcb4d61c853f54488e0b02d301033e Mon Sep 17 00:00:00 2001 From: Matan Kushner Date: Thu, 16 May 2019 09:40:30 -0600 Subject: ci: Fix CI to work with changes to Azure Pipelines build agent (#55) --- src/modules/directory.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/modules/directory.rs') diff --git a/src/modules/directory.rs b/src/modules/directory.rs index e0f4a9e12..710f73593 100644 --- a/src/modules/directory.rs +++ b/src/modules/directory.rs @@ -21,6 +21,7 @@ pub fn segment(context: &Context) -> Option { module.set_style(module_color); let current_dir = &context.current_dir; + log::debug!("Current directory: {:?}", current_dir); let dir_string; if let Some(repo_root) = &context.repo_root { @@ -58,7 +59,7 @@ fn contract_path(full_path: &Path, top_level_path: &Path, top_level_replacement: format!( "{replacement}{separator}{path}", replacement = top_level_replacement, - separator = std::path::MAIN_SEPARATOR, + separator = "/", path = full_path .strip_prefix(top_level_path) .unwrap() @@ -76,15 +77,13 @@ fn truncate(dir_string: String, length: usize) -> String { return dir_string; } - let components = dir_string - .split(std::path::MAIN_SEPARATOR) - .collect::>(); + let components = dir_string.split("/").collect::>(); if components.len() <= length { return dir_string; } let truncated_components = &components[components.len() - length..]; - truncated_components.join(&std::path::MAIN_SEPARATOR.to_string()) + truncated_components.join("/") } #[cfg(test)] -- cgit v1.2.3