match against file stem

reujab · Sep 12, 2019 · ec19904 · ec19904
1 parent dcb7f2b
commit ec19904
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -24,6 +24,7 @@ mod sh;
 use clap::App;
 use clap::AppSettings;
 use std::env;
+use std::path::Path;
 
 pub struct Segment {
     background: String,
@@ -53,12 +54,15 @@ fn main() {
         .get_matches();
 
     match matches.subcommand_name().unwrap() {
-        "init" => match shell.as_str() {
-            x if x.ends_with("bash") => print!("{}", include_str!("init.bash")),
-            x if x.ends_with("zsh") => print!("{}", include_str!("init.zsh")),
-            x if x.ends_with("fish") => print!("{}", include_str!("init.fish")),
-            x if x.ends_with("powershell") => print!("{}", include_str!("init.powershell")),
-            _ => panic!("unknown $SILVER_SHELL: \"{}\". Supported shells: bash, zsh, fish, powershell", shell),
+        "init" => match Path::new(&shell).file_stem().unwrap().to_str().unwrap() {
+            "bash" => print!("{}", include_str!("init.bash")),
+            "zsh" => print!("{}", include_str!("init.zsh")),
+            "fish" => print!("{}", include_str!("init.fish")),
+            "powershell" => print!("{}", include_str!("init.powershell")),
+            _ => panic!(
+                "unknown $SILVER_SHELL: \"{}\". Supported shells: bash, zsh, fish, powershell",
+                shell
+            ),
         },
         "print" => print::prompt(
             &shell,