mirror of
https://github.com/logos-storage/logos-storage-installer.git
synced 2026-01-02 13:33:11 +00:00
Merge 0484003a45a35664f7412efb1028d8697696c8cb into a67cf3031f7a702ea2ce0f702bd63a0471d83693
This commit is contained in:
commit
fe73104e1d
@ -163,7 +163,7 @@ async function performInstall(config) {
|
||||
|
||||
await runCommand('curl -LO --ssl-no-revoke https://get.codex.storage/install.cmd');
|
||||
await runCommand(`set "INSTALL_DIR=${installPath}" && "${process.cwd()}\\install.cmd"`);
|
||||
|
||||
|
||||
await saveCodexExePath(config, path.join(installPath, "codex.exe"));
|
||||
|
||||
try {
|
||||
@ -190,24 +190,10 @@ async function performInstall(config) {
|
||||
|
||||
const downloadCommand = 'curl -# --connect-timeout 10 --max-time 60 -L https://get.codex.storage/install.sh -o install.sh && chmod +x install.sh';
|
||||
await runCommand(downloadCommand);
|
||||
|
||||
if (platform === 'darwin') {
|
||||
const timeoutCommand = `perl -e '
|
||||
eval {
|
||||
local $SIG{ALRM} = sub { die "timeout\\n" };
|
||||
alarm(120);
|
||||
system("INSTALL_DIR=\\"${installPath}\\" bash install.sh");
|
||||
alarm(0);
|
||||
};
|
||||
die if $@;
|
||||
'`;
|
||||
await runCommand(timeoutCommand);
|
||||
} else {
|
||||
await runCommand(`INSTALL_DIR="${installPath}" timeout 120 bash install.sh`);
|
||||
}
|
||||
|
||||
await runCommand(`INSTALL_DIR="${installPath}" timeout 120 bash install.sh`);
|
||||
await saveCodexExePath(config, path.join(installPath, "codex"));
|
||||
|
||||
|
||||
} catch (error) {
|
||||
if (error.message.includes('ECONNREFUSED') || error.message.includes('ETIMEDOUT')) {
|
||||
throw new Error('Installation failed. Please check your internet connection and try again.');
|
||||
@ -222,7 +208,7 @@ async function performInstall(config) {
|
||||
await runCommand('rm -f install.sh').catch(() => {});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
try {
|
||||
const version = await getCodexVersion(config);
|
||||
console.log(chalk.green(version));
|
||||
@ -251,7 +237,7 @@ async function performInstall(config) {
|
||||
console.log(showInfoMessage(
|
||||
"Please review the configuration before starting Codex."
|
||||
));
|
||||
|
||||
|
||||
spinner.success();
|
||||
return true;
|
||||
} catch (error) {
|
||||
|
||||
@ -11,4 +11,4 @@ export async function runCommand(command) {
|
||||
console.error('Error:', error.message);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user