finishing touches

This commit is contained in:
NamedNeon 2023-09-13 18:16:38 -04:00
parent 295cdec9fa
commit d36e7853e7
2 changed files with 9 additions and 9 deletions

View File

@ -18,7 +18,8 @@ OxideFetch can display all of the following information:
- Operating system name, symbol, and matching color - Operating system name, symbol, and matching color
- Kernel version - Kernel version
- Uptime - Uptime
- Shell - Shell
- Terminal
- CPU - CPU
- GPU - GPU
- Memory - Memory
@ -63,8 +64,7 @@ No weird quirks to report at this time.
- Add host system name detection such as "Windows Subsystem for Linux", "IdeaPad 3", "Dell Optiplex", etc. - Add host system name detection such as "Windows Subsystem for Linux", "IdeaPad 3", "Dell Optiplex", etc.
- Add package count/package manager detection - Add package count/package manager detection
- Crosstest on more distributions to verify `sys.name()` outputs - Crosstest on more distributions to verify `sys.name()` outputs
#### Distant future: #### Distant future:
- Add terminal emulator detection by walking up the process tree
- More extensible user configuration for entry formatting - More extensible user configuration for entry formatting
### Changelog ### Changelog

View File

@ -24,7 +24,7 @@ const SELF_HOSTED_SHELLS: [&str; 2] = [
"powershell.exe" "powershell.exe"
]; ];
macro_rules! env_to_name { macro_rules! match_env_to_terminal {
($env: expr, $name: expr) => { ($env: expr, $name: expr) => {
match env::var($env) { match env::var($env) {
Ok(_) => return Some($name.to_string()), Ok(_) => return Some($name.to_string()),
@ -47,11 +47,11 @@ pub fn get_terminal() -> Option<String> {
Err(_) => (), Err(_) => (),
}; };
env_to_name!("ConEmuPID", "ConEmu"); match_env_to_terminal!("ConEmuPID", "ConEmu");
env_to_name!("WT_SESSION", "Windows Terminal"); match_env_to_terminal!("WT_SESSION", "Windows Terminal");
env_to_name!("SSH_CONNECTION", "SSH"); match_env_to_terminal!("SSH_CONNECTION", "SSH");
env_to_name!("tw52", "TosWin2"); match_env_to_terminal!("tw52", "TosWin2");
env_to_name!("tw100", "TosWin2"); match_env_to_terminal!("tw100", "TosWin2");
let mut pid = Pid::from_u32(std::process::id()); let mut pid = Pid::from_u32(std::process::id());
let shell = match env::var("SHELL") { let shell = match env::var("SHELL") {