Skip to content

Commit a69d5c0

Browse files
authored
Merge pull request #15 from harshshredding/main
Use a more general regex and improve error handling.
2 parents d01b2ef + ce7df7d commit a69d5c0

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

src/handler.rs

+7-2
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ pub fn remove(args: &command::Remove) {
9292
eprintln!("[CAM ERROR]: {}", err);
9393
process::exit(1);
9494
});
95-
let reg = Regex::new(r"alias ([0-9a-zA-Z_]*)='([0-9a-zA-Z_ ]*)'").unwrap();
95+
let reg = Regex::new(r"alias ([0-9a-zA-Z_]*)='([\S ]*)'").unwrap();
9696
let remove_alias = reg
9797
.captures_iter(file_content.as_str())
9898
.filter(|cap| cap.get(1).unwrap().as_str() == args.name)
@@ -109,6 +109,11 @@ pub fn remove(args: &command::Remove) {
109109
"[CAM INFO]: remove {} alias succeeded, please run `source {}`",
110110
args.name, env_path
111111
);
112+
} else {
113+
println!(
114+
"[CAM INFO]: Could not find a valid alias named `{}` in .camrc.",
115+
args.name
116+
)
112117
}
113118
} else {
114119
println!("[CAM INFO]: camer is not initialized, please run 'camer init'");
@@ -120,7 +125,7 @@ fn check_name_exist(name: &String) -> bool {
120125
eprintln!("[CAM ERROR]: {}", err);
121126
process::exit(1);
122127
});
123-
let reg = Regex::new(r"alias ([0-9a-zA-Z_]*)='([0-9a-zA-Z_ ]*)'").unwrap();
128+
let reg = Regex::new(r"alias ([0-9a-zA-Z_]*)='([\S ]*)'").unwrap();
124129
let filter_res = reg
125130
.captures_iter(file_content.as_str())
126131
.map(|cap| cap.get(1).unwrap().as_str())

0 commit comments

Comments
 (0)