Fix cargo command not found after Rust installation
This commit is contained in:
50
dist/cli.js
vendored
50
dist/cli.js
vendored
@@ -6,6 +6,7 @@ import path from 'path';
|
||||
import fsExtra from 'fs-extra';
|
||||
import { fileURLToPath } from 'url';
|
||||
import prompts from 'prompts';
|
||||
import os from 'os';
|
||||
import { execa, execaSync } from 'execa';
|
||||
import crypto from 'crypto';
|
||||
import ora from 'ora';
|
||||
@@ -284,6 +285,52 @@ async function isChinaIP(ip, domain) {
|
||||
}
|
||||
}
|
||||
|
||||
function normalizePathForComparison(targetPath) {
|
||||
const normalized = path.normalize(targetPath);
|
||||
return IS_WIN ? normalized.toLowerCase() : normalized;
|
||||
}
|
||||
function getCargoHomeCandidates() {
|
||||
const candidates = new Set();
|
||||
if (process.env.CARGO_HOME) {
|
||||
candidates.add(process.env.CARGO_HOME);
|
||||
}
|
||||
const homeDir = os.homedir();
|
||||
if (homeDir) {
|
||||
candidates.add(path.join(homeDir, '.cargo'));
|
||||
}
|
||||
if (IS_WIN && process.env.USERPROFILE) {
|
||||
candidates.add(path.join(process.env.USERPROFILE, '.cargo'));
|
||||
}
|
||||
return Array.from(candidates).filter(Boolean);
|
||||
}
|
||||
function ensureCargoBinOnPath() {
|
||||
const currentPath = process.env.PATH || '';
|
||||
const segments = currentPath.split(path.delimiter).filter(Boolean);
|
||||
const normalizedSegments = new Set(segments.map((segment) => normalizePathForComparison(segment)));
|
||||
const additions = [];
|
||||
let cargoHomeSet = Boolean(process.env.CARGO_HOME);
|
||||
for (const cargoHome of getCargoHomeCandidates()) {
|
||||
const binDir = path.join(cargoHome, 'bin');
|
||||
if (fsExtra.pathExistsSync(binDir) &&
|
||||
!normalizedSegments.has(normalizePathForComparison(binDir))) {
|
||||
additions.push(binDir);
|
||||
normalizedSegments.add(normalizePathForComparison(binDir));
|
||||
}
|
||||
if (!cargoHomeSet && fsExtra.pathExistsSync(cargoHome)) {
|
||||
process.env.CARGO_HOME = cargoHome;
|
||||
cargoHomeSet = true;
|
||||
}
|
||||
}
|
||||
if (additions.length) {
|
||||
const prefix = additions.join(path.delimiter);
|
||||
process.env.PATH = segments.length
|
||||
? `${prefix}${path.delimiter}${segments.join(path.delimiter)}`
|
||||
: prefix;
|
||||
}
|
||||
}
|
||||
function ensureRustEnv() {
|
||||
ensureCargoBinOnPath();
|
||||
}
|
||||
async function installRust() {
|
||||
const isActions = process.env.GITHUB_ACTIONS;
|
||||
const isInChina = await isChinaDomain('sh.rustup.rs');
|
||||
@@ -295,6 +342,7 @@ async function installRust() {
|
||||
try {
|
||||
await shellExec(IS_WIN ? rustInstallScriptForWindows : rustInstallScriptForMac);
|
||||
spinner.succeed(chalk.green('✔ Rust installed successfully!'));
|
||||
ensureRustEnv();
|
||||
}
|
||||
catch (error) {
|
||||
spinner.fail(chalk.red('✕ Rust installation failed!'));
|
||||
@@ -303,6 +351,7 @@ async function installRust() {
|
||||
}
|
||||
}
|
||||
function checkRustInstalled() {
|
||||
ensureCargoBinOnPath();
|
||||
try {
|
||||
execaSync('rustc', ['--version']);
|
||||
return true;
|
||||
@@ -674,6 +723,7 @@ class BaseBuilder {
|
||||
logger.warn('✼ The first use requires installing system dependencies.');
|
||||
logger.warn('✼ See more in https://tauri.app/start/prerequisites/.');
|
||||
}
|
||||
ensureRustEnv();
|
||||
if (!checkRustInstalled()) {
|
||||
const res = await prompts({
|
||||
type: 'confirm',
|
||||
|
||||
Reference in New Issue
Block a user