extern/starship
1
0
Fork 0
mirror of https://github.com/starship/starship.git synced 2024-11-29 03:33:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(hostname): use DNS instead of NetBIOS name on Windows

Browse Source
This commit is contained in:
David Knaack 2024-10-21 21:13:42 +02:00
parent eaccc512f2
commit 2133bf3142
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/hostname.rs
View File

@ -4,7 +4,14 @@ use crate::config::ModuleConfig;
use crate::configs::hostname::HostnameConfig; use crate::configs::hostname::HostnameConfig;
use crate::formatter::StringFormatter; use crate::formatter::StringFormatter;
#[cfg(not(windows))]
use whoami::fallible::hostname; use whoami::fallible::hostname;
// On Windows, whoami::hostname() returns the NetBIOS name,
// but we prefer the "hostname" returned by whoami::devicname()
// which does a better job of preserving case and returns the
// DNS name.
#[cfg(windows)]
use whoami::fallible::devicename as hostname;
/// Creates a module with the system hostname /// Creates a module with the system hostname
/// ///
@ -80,13 +87,14 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::hostname;
use crate::test::ModuleRenderer; use crate::test::ModuleRenderer;
use nu_ansi_term::{Color, Style}; use nu_ansi_term::{Color, Style};
use unicode_segmentation::UnicodeSegmentation; use unicode_segmentation::UnicodeSegmentation;
macro_rules! get_hostname { macro_rules! get_hostname {
() => { () => {
if let Ok(hostname) = whoami::fallible::hostname() { if let Ok(hostname) = hostname() {
hostname hostname
} else { } else {
println!( println!(