AbleOS
/
ableos_userland
2
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Update shell version

pull/1/head
Able 2022-12-05 04:14:26 -06:00
parent d209e69659
commit 45c20b9654
Signed by: able
GPG Key ID: 0BD8B45C30DCA887
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -237,6 +237,7 @@ name = "shell"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"clparse", "clparse",
"versioning",
] ]
[[package]] [[package]]

2
libraries/versioning/src/lib.rs
View File

@ -41,7 +41,7 @@ impl Version {
impl Display for Version { impl Display for Version {
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
write!(f, "v{}.{}.{}", self.major, self.minor, self.patch)?; write!(f, "{}.{}.{}", self.major, self.minor, self.patch)?;
Ok(()) Ok(())
} }
} }

1
programs/shell/Cargo.toml
View File

@ -7,3 +7,4 @@ edition = "2021"
[dependencies] [dependencies]
clparse = { path = "../../libraries/clparse" } clparse = { path = "../../libraries/clparse" }
versioning = { path = "../../libraries/versioning" }

11
programs/shell/src/main.rs
View File

@ -5,7 +5,9 @@ use std::{
process::{Child, Command, Stdio}, process::{Child, Command, Stdio},
}; };
const VERSION: &str = env!("CARGO_PKG_VERSION"); use versioning::Version;
pub const VERSION: Version = Version::new(0, 1, 0);
fn main() { fn main() {
let ret = clparse::Arguments::parse_from_args().unwrap(); let ret = clparse::Arguments::parse_from_args().unwrap();
let config = ret.0; let config = ret.0;
@ -55,3 +57,10 @@ fn main() {
} }
} }
} }
#[test]
fn sanity_check_version() {
let cargo_version = env!("CARGO_PKG_VERSION");
let str_version = format!("{}", VERSION);
assert_eq!(str_version, cargo_version);
}