Xory/mrfetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

smol fix. read commit below. TODO: use pull requests

Browse source
This commit is contained in:
iVacon 2023-06-19 20:52:21 +03:00
parent 3509155696
commit 7844de914f
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main.rs
View file

@ -18,6 +18,8 @@ fn main() {
// .output() // .output()
// .expect("Failed to get hostname"); // .expect("Failed to get hostname");
// let hostname = String::from_utf8_lossy(&hostname.stdout); // let hostname = String::from_utf8_lossy(&hostname.stdout);
let user = env::var("USER"); let user = env::var("USER");
@ -149,19 +151,10 @@ fn main() {
i += 1; i += 1;
} }
<<<<<<< HEAD
let mut model: String = String::new(); let mut model: String = String::new();
if let Some(Ok(line)) = lines.next() { if let Some(Ok(line)) = lines.next() {
model = line.split(':').nth(1).expect("Failed to parse CPU Info").trim().to_string(); model = line.split(':').nth(1).expect("Failed to parse CPU Info").trim().to_string();
=======
let mut model: String = String::new();
if let Some(Ok(line)) = lines.next() {
model = line.split(':').nth(1).expect("Failed to parse CPU Info").trim().to_string();
>>>>>>> 8afde3292bdd5b9f673658918a3b57b8237d85fd
} }
println!("┘ CPU: {}", Purple.paint(model)); println!("┘ CPU: {}", Purple.paint(model));