fix: check executable in nushell

README.md

@@ -37,7 +37,7 @@ You can now **press `F` to Pay Respects**!
 
 Currently, only corrections to `bash`, `zsh`, and `fish` are working flawlessly.
 
-Note that `nushell` support is currently very broken.
+`nushell` is currently usable, but there is no alias expansion and you will have to add the corresponding environment variables manually.
 
 ## Installing
 

rule_parser/src/lib.rs

@@ -166,17 +166,7 @@ fn parse_conditions(suggest: &str) -> (String, Vec<TokenStream2>) {
 
 fn eval_condition(condition: &str, arg: &str) -> TokenStream2 {
 	match condition {
-		"executable" => {
+		"executable" => quote!{check_executable(shell, #arg)},
-			quote!{
-				std::process::Command::new(shell)
-					.arg("-c")
-					.arg(format!("command -v {}", #arg))
-					.output()
-					.expect("failed to execute process")
-					.status
-					.success()
-			}
-		},
 		"err_contains" => quote!{error_msg.contains(#arg)},
 		"cmd_contains" => quote!{last_command.contains(#arg)},
 		_ => unreachable!("Unknown condition when evaluation condition: {}", condition),

src/suggestions.rs

@@ -44,6 +44,30 @@ fn match_pattern(
 	parse_rules!("rules");
 }
 
+fn check_executable(shell: &str, executable: &str) -> bool {
+	match shell {
+		"nu" => {
+			std::process::Command::new(shell)
+				.arg("-c")
+				.arg(format!("if (which {} | is-empty) {{ exit 1 }}", executable))
+				.output()
+				.expect("failed to execute process")
+				.status
+				.success()
+		}
+		_ => {
+			std::process::Command::new(shell)
+				.arg("-c")
+				.arg(format!("command -v {}", executable))
+				.output()
+				.expect("failed to execute process")
+				.status
+				.success()
+		}
+	}
+
+}
+
 fn opt_regex(regex: &str, command: &mut String) -> String {
 	let regex = Regex::new(regex).unwrap();
 	let opts = regex