h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-26 07:41:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

builtin status: sort list-files, like globs

Browse Source 
This is important for deterministic behavior across both standalone
and installed builds in "fish_config prompt list".

I later realized that we could use "path sort" I suppose, but why
not fix the problem for everyone.
This commit is contained in:
Johannes Altmanninger
2025-10-13 17:28:48 +02:00
parent 03d21edd63
commit 4532fc0c1b
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/builtins/status.rs
View File

@@ -505,18 +505,23 @@ pub fn status(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) -> B
}
#[cfg(feature = "embed-data")]
{
let mut have_file = false;
use crate::util::wcsfilecmp_glob;
let mut paths = vec![];
let arg = crate::common::wcs2string(args.get(0).unwrap_or(&L!("")));
let arg = std::str::from_utf8(&arg).unwrap();
for path in crate::autoload::Asset::iter().chain(Docs::iter()) {
if arg.is_empty() || path.starts_with(arg) {
have_file = true;
let src = str2wcstring(path.as_bytes());
streams.out.appendln(src);
paths.push(str2wcstring(path.as_bytes()));
}
}
if have_file {
paths.sort_by(|a, b| wcsfilecmp_glob(a, b));
for path in &paths {
streams.out.appendln(path);
}
if !paths.is_empty() {
return Ok(SUCCESS);
} else {
return Err(STATUS_CMD_ERROR);