From a8b8d61112f60aa11d7f16c3fc7b766f07e7cebe Mon Sep 17 00:00:00 2001 From: zxq5 Date: Tue, 18 Feb 2025 01:50:21 +0000 Subject: [PATCH] made changes to some stuff --- .idea/vcs.xml | 1 - src/system/std/os.rs | 4 +++- src/user/bin/shell.rs | 2 +- src/user/bin/utils/crystalfetch.rs | 7 ++++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 0f2e3fa..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,6 +2,5 @@ - \ No newline at end of file diff --git a/src/system/std/os.rs b/src/system/std/os.rs index 8e3bd37..5e3b149 100644 --- a/src/system/std/os.rs +++ b/src/system/std/os.rs @@ -4,13 +4,15 @@ use alloc::{string::String}; lazy_static! { pub static ref OS: Mutex = Mutex::new(SysInfo { - os: String::from("CrystalOS Alpha"), + os: String::from("Zxq5-OS"), version: String::from("0.2.2"), + url: String::from("https://git.zxq5.dev/OsDev/Zxq5-OS") }); } pub struct SysInfo { pub os: String, pub version: String, + pub url: String, } diff --git a/src/user/bin/shell.rs b/src/user/bin/shell.rs index 8150f5d..0849961 100644 --- a/src/user/bin/shell.rs +++ b/src/user/bin/shell.rs @@ -273,7 +273,7 @@ impl CommandHandler { // TODO: coloured prompt pub fn prompt(&self) { - write(format_args!("\n Crystal> "), (Color::Cyan, Color::Black)); + write(format_args!("\n "), (Color::Cyan, Color::Black)); } } diff --git a/src/user/bin/utils/crystalfetch.rs b/src/user/bin/utils/crystalfetch.rs index 003ca97..daec48f 100644 --- a/src/user/bin/utils/crystalfetch.rs +++ b/src/user/bin/utils/crystalfetch.rs @@ -59,6 +59,7 @@ impl Application for CrystalFetch { let os = OS.lock().os.clone(); let version = OS.lock().version.clone(); + let git_url = OS.lock().url.clone(); // clear screen Display::clear(); @@ -67,9 +68,9 @@ impl Application for CrystalFetch { let info_string = format!( " [ OS » {} [ BUILD » {} - [ Shell » CrySH - [ Github » https://github.com/FantasyPvP/CrystalOS - [ Author » ZXQ5", os, version); + [ Shell » ZxqSH + [ Git » {} + [ Author » ZXQ5", os, version, git_url); // write to output let spacer = "\n".repeat(25 - logo_string.lines().count() - 4 - info_string.lines().count());