fix completion generators if usage is not installed

andrewthauer · Feb 11, 2024 · e46fe04 · e46fe04
1 parent 111a218
commit e46fe04
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/src/cli/completion.rs b/src/cli/completion.rs
@@ -33,17 +33,19 @@ impl Completion {
         let shell = self.shell.or(self.shell_type).unwrap();
 
         if self.usage || matches!(shell, Shell::Bash | Shell::Fish) {
-            let shell = shell.to_string();
-            cmd!(
+            let res = cmd!(
                 "usage",
                 "generate",
                 "completion",
-                &shell,
+                shell.to_string(),
                 "mise",
                 "--usage-cmd",
                 "mise usage"
             )
-            .run()?;
+            .run();
+            if res.is_err() {
+                return self.prerendered(shell);
+            }
             return Ok(());
         }
 
@@ -56,6 +58,16 @@ impl Completion {
 
         Ok(())
     }
+
+    fn prerendered(&self, shell: Shell) -> Result<()> {
+        let script = match shell {
+            Shell::Bash => include_str!("../../completions/mise.bash"),
+            Shell::Fish => include_str!("../../completions/mise.fish"),
+            Shell::Zsh => include_str!("../../completions/_mise"),
+        };
+        miseprintln!("{}", script.trim())?;
+        Ok(())
+    }
 }
 
 static AFTER_LONG_HELP: &str = color_print::cstr!(
@@ -67,7 +79,7 @@ static AFTER_LONG_HELP: &str = color_print::cstr!(
 "#
 );
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Copy)]
 enum Shell {
     Bash,
     Fish,