diff --git a/src/util.rs b/src/util.rs index 6abf48b..108a3f7 100644 --- a/src/util.rs +++ b/src/util.rs @@ -106,6 +106,22 @@ fn install_unix_release(args: &[&str]) -> Result<(), MoonOpsError> { }); } + let version_cmd = "moon version --all"; + let output = std::process::Command::new("moon") + .args(["version", "--all"]) + .output() + .map_err(|e| MoonOpsError { + cmd: version_cmd.to_string(), + kind: MoonOpsErrorKind::IOError(e), + })?; + if !output.status.success() { + return Err(MoonOpsError { + cmd: version_cmd.to_string(), + kind: MoonOpsErrorKind::ReturnNonZero(output.status), + }); + } + println!("Version command output: {}", String::from_utf8_lossy(&output.stdout)); + Ok(()) } @@ -130,6 +146,22 @@ fn install_windows_release(is_bleeding: bool) -> Result<(), MoonOpsError> { }); } + let version_cmd = "moon version --all"; + let output = std::process::Command::new("moon") + .args(["version", "--all"]) + .output() + .map_err(|e| MoonOpsError { + cmd: version_cmd.to_string(), + kind: MoonOpsErrorKind::IOError(e), + })?; + if !output.status.success() { + return Err(MoonOpsError { + cmd: version_cmd.to_string(), + kind: MoonOpsErrorKind::ReturnNonZero(output.status), + }); + } + println!("Version command output: {}", String::from_utf8_lossy(&output.stdout)); + Ok(()) } diff --git a/webapp/src/App.tsx b/webapp/src/App.tsx index 863e732..a51265b 100644 --- a/webapp/src/App.tsx +++ b/webapp/src/App.tsx @@ -391,7 +391,7 @@ const App = () => { {error ? (

{error}

- ) : platformData.mac ? ( + ) : platformData.linux ? (
@@ -402,14 +402,14 @@ const App = () => {
Stable Release
- {platformData.mac.stable_toolchain_version.moon_version} / moonc {platformData.mac.stable_toolchain_version.moonc_version} + {platformData.linux.stable_toolchain_version.moon_version} / moonc {platformData.linux.stable_toolchain_version.moonc_version}
⚡️ Bleeding Edge Release
- {platformData.mac.bleeding_toolchain_version.moon_version} / moonc {platformData.mac.bleeding_toolchain_version.moonc_version} + {platformData.linux.bleeding_toolchain_version.moon_version} / moonc {platformData.linux.bleeding_toolchain_version.moonc_version}