Llewellyn/starship
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/starship.git synced 2025-01-15 11:17:00 +00:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
David Knaack 2025-01-11 15:00:48 +01:00 committed by GitHub
parent af5d139060
commit 43f097eae8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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::formatter::StringFormatter;
#[cfg(not(windows))]
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
///
@ -80,13 +87,14 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
#[cfg(test)]
mod tests {
use super::hostname;
use crate::test::ModuleRenderer;
use nu_ansi_term::{Color, Style};
use unicode_segmentation::UnicodeSegmentation;
macro_rules! get_hostname {
() => {
if let Ok(hostname) = whoami::fallible::hostname() {
if let Ok(hostname) = hostname() {
hostname
} else {
println!(