feat: rustup (#49)

.changeset/twenty-months-type.md

@@ -0,0 +1,5 @@
+---
+"mucho": patch
+---
+
+ensure the installer checks for rustup AND rustc

src/const/setup.ts

@@ -8,6 +8,9 @@ export const TOOL_CONFIG: { [key in ToolNames]: ToolCommandConfig } = {
     pathSource: "$HOME/.cargo/env",
     version: "rustc --version",
   },
+  rustup: {
+    version: "rustup --version",
+  },
   solana: {
     dependencies: ["rust"],
     pathSource: "$HOME/.local/share/solana/install/active_release/bin",

src/lib/install.ts

@@ -140,11 +140,18 @@ export async function installRust({ version }: InstallCommandPropsBase = {}) {
       }
     }
 
-    let installedVersion = await installedToolVersion("rust");
-    if (installedVersion) {
-      spinner.info(`rust ${installedVersion} is already installed`);
-      // todo: detect if the $PATH is actually loaded
-      return true;
+    let [installedVersion, rustupVersion] = await Promise.all([
+      installedToolVersion("rust"),
+      installedToolVersion("rustup"),
+    ]);
+
+    if (rustupVersion) {
+      installedVersion = await installedToolVersion("rust");
+      if (installedVersion) {
+        spinner.info(`rust ${installedVersion} is already installed`);
+        // todo: detect if the $PATH is actually loaded
+        return true;
+      }
     }
 
     spinner.text = "Installing the rust toolchain using rustup";

src/lib/setup.ts

@@ -20,6 +20,7 @@ export async function checkInstalledTools({
   let allInstalled = true;
 
   let status: { [key in ToolNames]: string | boolean } = {
+    rustup: false,
     rust: false,
     solana: false,
     avm: false,

src/types/index.ts

@@ -2,6 +2,7 @@ export type PlatformOS = "unknown" | "linux" | "mac" | "windows";
 
 export type ToolNames =
   | "rust"
+  | "rustup"
   | "solana"
   | "avm"
   | "anchor"