diff --git a/src/mods/help.rs b/src/mods/help.rs index 0f758b3..f6fb885 100644 --- a/src/mods/help.rs +++ b/src/mods/help.rs @@ -1,15 +1,18 @@ -use crate::mods::strs::inf; +use crate::mods::strs::{inf, err_rec}; -pub fn help() { // work on a proper error message, the python ame one isnt really better in my opinion +pub fn help() { + println!(""); inf(format!("Usage:")); println!(" -ame -S / -Sy / ins - install a package -ame -R / -Rs / rm - remove a package -ame -Syu / upg - upgrade all packages to latest version -ame -Ss / sea - search for a package -ame -Sa / aursea - search for a package in the aur -ame -Sr / repsea - search for a package in the repos -ame -v / -V / ver - contributors and version info -" -); +ame -S(n) / ins - install a package +ame -R(n) / -Rs(n) / rm - remove a package +ame -Syu(n) / upg - upgrade all packages to latest version +ame -Ss / sea - search for a package +ame -Sa / aursea - search for a package in the aur +ame -Sr / repsea - search for a package in the repos +ame -v / ver - contributors and version info"); + println!(""); + err_rec(format!("Appending 'n' where (n) is present passes '--noconfirm' to pacman. Use at your own risk.")); + println!(""); + } diff --git a/src/mods/strs.rs b/src/mods/strs.rs index 45eb83e..7e0fd44 100644 --- a/src/mods/strs.rs +++ b/src/mods/strs.rs @@ -4,7 +4,7 @@ use std::process; pub fn inf(a: std::string::String){ println!("{} {}", Colour::Purple.bold().paint("❖"), - Colour::White.paint(a)); + Colour::White.bold().paint(a)); } pub fn err_unrec(a: std::string::String) { @@ -17,8 +17,8 @@ pub fn err_unrec(a: std::string::String) { // we havent actually used this one yet -/*pub fn err_rec(a: std::string::String) { +pub fn err_rec(a: std::string::String) { println!("{} {}", - Colour::Yellow.bold().paint("! Warning:"), + Colour::Yellow.bold().paint("⚠ WARNING:"), Colour::Yellow.paint(a)); -}*/ +} diff --git a/src/mods/ver.rs b/src/mods/ver.rs index 00df516..abb00d1 100644 --- a/src/mods/ver.rs +++ b/src/mods/ver.rs @@ -1,7 +1,9 @@ use crate::mods::strs::inf; +use ansi_term::Colour; pub fn ver() { - inf(format!("ame - v3.0.0")); + println!(""); + inf(format!("ame - v2.1.0")); println!(""); inf(format!("Contributors:")); println!("- axtlos "); @@ -11,6 +13,7 @@ pub fn ver() { println!(""); inf(format!("This software is licensed under the BSD 3-Clause license.")); inf(format!("All source code is available at:")); - println!("https://github.com/crystal-linux/ame"); + println!(""); + println!("{}", Colour::Purple.bold().paint("https://github.com/crystal-linux/ame")); println!(""); }