From 61d506afd08ee4e30d520304ca4d85d508e66b2f Mon Sep 17 00:00:00 2001 From: Johannes Altmanninger Date: Sat, 9 Sep 2023 16:49:16 +0200 Subject: [PATCH] builtin status: use program name constant again --- fish-rust/src/builtins/status.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fish-rust/src/builtins/status.rs b/fish-rust/src/builtins/status.rs index aa1abd6c1..d1ac380eb 100644 --- a/fish-rust/src/builtins/status.rs +++ b/fish-rust/src/builtins/status.rs @@ -1,7 +1,7 @@ use std::os::unix::prelude::*; use super::prelude::*; -use crate::common::{get_executable_path, str2wcstring}; +use crate::common::{get_executable_path, str2wcstring, PROGRAM_NAME}; use crate::ffi::{ get_job_control_mode, get_login, is_interactive_session, job_control_t, set_job_control_mode, }; @@ -537,8 +537,7 @@ pub fn status( if !var.is_empty() { streams.out.appendln(var); } else { - // FIXME: C++ used `program_name` here, no clue where it's from - streams.out.appendln(L!("fish")); + streams.out.appendln(PROGRAM_NAME.get().unwrap()); } } STATUS_CURRENT_COMMANDLINE => {