Rust/sqish
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Can now cd to a directory containing spaces; entering a command reset

Browse Source 
the history callback counter. Changed the exit prompt to be friendlier.
This commit is contained in:
Justine 2023-02-20 18:34:42 +01:00
parent 981cebea5b
commit 30cb3f9887
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -5,7 +5,6 @@ TODO:
* Aliases don't currently handle arguments. My alias "vless" does not work with "vless lib.rs" * Aliases don't currently handle arguments. My alias "vless" does not work with "vless lib.rs"
* A shortcut / implemented command to show all Hotkeys * A shortcut / implemented command to show all Hotkeys
* git commit -m "message" does not work * git commit -m "message" does not work
* Can't cd to a directory containing spaces in its name
* Startup script section in sqishrc * Startup script section in sqishrc
## sqishrc (Config) ## sqishrc (Config)

17
src/lib.rs
View File

@ -47,9 +47,17 @@ pub mod shell {
match command { match command {
"cd" => { "cd" => {
let args = args.collect::<Vec<&str>>();
let homedir = dirs::home_dir().unwrap().into_os_string().into_string().unwrap(); let homedir = dirs::home_dir().unwrap().into_os_string().into_string().unwrap();
let new_dir = args.peekable().peek().map_or(homedir.as_str(), |x| *x); //let new_dir = args.peekable().peek().map_or(homedir.as_str(), |x| *x);
let root = Path::new(new_dir); let mut new_dir = String::new();
if args.len() > 0 {
*&mut new_dir = args.join(" ");
} else {
*&mut new_dir = String::from(homedir.as_str());
}
let root = Path::new(&new_dir);
if let Err(e) = env::set_current_dir(&root) { if let Err(e) = env::set_current_dir(&root) {
eprintln!(" Err: {}", e); eprintln!(" Err: {}", e);
} else { } else {
@ -237,7 +245,7 @@ pub mod shell {
stdout.flush(); stdout.flush();
*current_number += 1; *current_number += 1;
} else if mycommand == &String::from("exit") { } else if mycommand == &String::from("exit") {
write!(stdout, "\r\n Sayonara \r\n"); write!(stdout, "\r\nThanks for using Sqish!\r\nSayonara \r\n");
RawTerminal::suspend_raw_mode(&stdout); RawTerminal::suspend_raw_mode(&stdout);
std::process::exit(0); std::process::exit(0);
} else { } else {
@ -342,6 +350,7 @@ pub mod shell {
stdout.flush(); stdout.flush();
} }
Key::Char('\n') => { Key::Char('\n') => {
current_number = get_curr_history_number();
current_pos = 0; current_pos = 0;
max_pos = 0; max_pos = 0;
run_cmd(&mut mycommand, run_cmd(&mut mycommand,
@ -352,7 +361,7 @@ pub mod shell {
Key::Ctrl('q'|'d') => { Key::Ctrl('q'|'d') => {
RawTerminal::suspend_raw_mode(&stdout); RawTerminal::suspend_raw_mode(&stdout);
writeln!(stdout, "\r\n Sayonara \r\n"); writeln!(stdout, "\r\nThanks for using Sqish !\r\nSayonara \r\n");
break; break;
}, },