diff --git a/src/flask/install.ts b/src/flask/install.ts index 8c0732d..e43eff2 100644 --- a/src/flask/install.ts +++ b/src/flask/install.ts @@ -7,7 +7,7 @@ import { METAMASK_GITHUB_API, RECOMMENDED_METAMASK_FLASK_VERSIONS } from '../constants'; -import { logError, logInfo, logSuccess } from '../log'; +import { logInfo, logSuccess } from '../log'; import { Asset } from '../types'; import { compareVersion, @@ -20,26 +20,22 @@ import { } from '../wallet/install'; export async function install(directory: string, version: string = DEFAULT_METAMASK_FLASK_VERSION): Promise { - try { - const assetName = `${DEFAULT_METAMASK_FLASK_ASSET}-${version}-flask.0`; - let destDir: string = `${directory}/${assetName}`; - const exists = fileExists(destDir); - if (exists) { - logInfo(`MetaMask Flask version already exists in ${destDir}`); - return destDir; - } - compareVersion(METAMASK_FLASK, version, RECOMMENDED_METAMASK_FLASK_VERSIONS); - const release: any = await fetchGithubRelease(METAMASK_FLASK, version, METAMASK_GITHUB_API); - const asset: Asset = findGithubAsset(assetName, release); - createDirectory(directory); - const fileName: string = await downloadAssetZipFile(asset, directory); - destDir = extractZipContents(fileName); - await enableMetaMaskAutomation(destDir); - logSuccess(`Installed MetaMask Flask version \n${destDir}`); + const assetName = `${DEFAULT_METAMASK_FLASK_ASSET}-${version}-flask.0`; + let destDir: string = `${directory}/${assetName}`; + const exists = fileExists(destDir); + if (exists) { + logInfo(`MetaMask Flask version already exists in ${destDir}`); return destDir; - } catch (error: any) { - logError(error.message); } + compareVersion(METAMASK_FLASK, version, RECOMMENDED_METAMASK_FLASK_VERSIONS); + const release: any = await fetchGithubRelease(METAMASK_FLASK, version, METAMASK_GITHUB_API); + const asset: Asset = findGithubAsset(assetName, release); + createDirectory(directory); + const fileName: string = await downloadAssetZipFile(asset, directory); + destDir = extractZipContents(fileName); + await enableMetaMaskAutomation(destDir); + logSuccess(`Installed MetaMask Flask version \n${destDir}`); + return destDir; } export async function enableMetaMaskAutomation(metaMaskPath: string): Promise { diff --git a/src/metamask/install.ts b/src/metamask/install.ts index 742e13c..bd49d81 100644 --- a/src/metamask/install.ts +++ b/src/metamask/install.ts @@ -7,7 +7,7 @@ import { METAMASK_GITHUB_API, RECOMMENDED_METAMASK_VERSIONS } from '../constants'; -import { logError, logInfo, logSuccess } from '../log'; +import { logInfo, logSuccess } from '../log'; import { Asset } from '../types'; import { compareVersion, @@ -20,26 +20,22 @@ import { } from '../wallet/install'; export async function install(directory: string, version: string = DEFAULT_METAMASK_VERSION): Promise { - try { - const assetName = `${DEFAULT_METAMASK_ASSET}-${version}`; - let destDir: string = `${directory}/${assetName}`; - const exists = fileExists(destDir); - if (exists) { - logInfo(`MetaMask version already exists in ${destDir}`); - return destDir; - } - compareVersion(METAMASK, version, RECOMMENDED_METAMASK_VERSIONS); - const release: any = await fetchGithubRelease(METAMASK, version, METAMASK_GITHUB_API); - const asset: Asset = findGithubAsset(assetName, release); - createDirectory(directory); - const fileName: string = await downloadAssetZipFile(asset, directory); - destDir = extractZipContents(fileName); - await enableMetaMaskAutomation(destDir); - logSuccess(`Installed MetaMask version \n${destDir}`); + const assetName = `${DEFAULT_METAMASK_ASSET}-${version}`; + let destDir: string = `${directory}/${assetName}`; + const exists = fileExists(destDir); + if (exists) { + logInfo(`MetaMask version already exists in ${destDir}`); return destDir; - } catch (error: any) { - logError(error.message); } + compareVersion(METAMASK, version, RECOMMENDED_METAMASK_VERSIONS); + const release: any = await fetchGithubRelease(METAMASK, version, METAMASK_GITHUB_API); + const asset: Asset = findGithubAsset(assetName, release); + createDirectory(directory); + const fileName: string = await downloadAssetZipFile(asset, directory); + destDir = extractZipContents(fileName); + await enableMetaMaskAutomation(destDir); + logSuccess(`Installed MetaMask version \n${destDir}`); + return destDir; } export async function enableMetaMaskAutomation(metaMaskPath: string): Promise { diff --git a/src/rainbow/install.ts b/src/rainbow/install.ts index be5b964..90a9b09 100644 --- a/src/rainbow/install.ts +++ b/src/rainbow/install.ts @@ -1,5 +1,5 @@ import { DEFAULT_RAINBOW_VERSION, RAINBOW, RAINBOW_GITHUB_API, RECOMMENDED_RAINBOW_VERSIONS } from '../constants'; -import { logError, logInfo, logSuccess } from '../log'; +import { logInfo, logSuccess } from '../log'; import { Artifact } from '../types'; import { checkEnvVariable, @@ -15,27 +15,23 @@ import { } from '../wallet/install'; export async function install(directory: string, version: string = DEFAULT_RAINBOW_VERSION): Promise { - try { - const artifactName = `rainbowbx-chrome-v${version}`; - let destDir: string = `${directory}/${artifactName}`; - const exists = fileExists(destDir); - if (exists) { - logInfo(`Rainbow version already exists in ${destDir}`); - return destDir; - } - const workflowName = 'Publish to Chrome (Prod)'; - checkEnvVariable('GITHUB_TOKEN'); - compareVersion(RAINBOW, version, RECOMMENDED_RAINBOW_VERSIONS); - await fetchGithubTags(RAINBOW, version, RAINBOW_GITHUB_API); - const workflow = await fetchGithubWorkflow(workflowName, RAINBOW_GITHUB_API); - const run = await fetchGithubRun(version, workflowName, workflow, RAINBOW_GITHUB_API); - const artifact: Artifact = await fetchGithubArtifact(artifactName, run, RAINBOW_GITHUB_API); - createDirectory(directory); - const fileName: string = await downloadArtifactZipFile(artifact, directory); - destDir = extractZipContents(fileName); - logSuccess(`Installed Rainbow version \n${destDir}`); + const artifactName = `rainbowbx-chrome-v${version}`; + let destDir: string = `${directory}/${artifactName}`; + const exists = fileExists(destDir); + if (exists) { + logInfo(`Rainbow version already exists in ${destDir}`); return destDir; - } catch (error: any) { - logError(error.message); } + const workflowName = 'Publish to Chrome (Prod)'; + checkEnvVariable('GITHUB_TOKEN'); + compareVersion(RAINBOW, version, RECOMMENDED_RAINBOW_VERSIONS); + await fetchGithubTags(RAINBOW, version, RAINBOW_GITHUB_API); + const workflow = await fetchGithubWorkflow(workflowName, RAINBOW_GITHUB_API); + const run = await fetchGithubRun(version, workflowName, workflow, RAINBOW_GITHUB_API); + const artifact: Artifact = await fetchGithubArtifact(artifactName, run, RAINBOW_GITHUB_API); + createDirectory(directory); + const fileName: string = await downloadArtifactZipFile(artifact, directory); + destDir = extractZipContents(fileName); + logSuccess(`Installed Rainbow version \n${destDir}`); + return destDir; } diff --git a/src/zerion/install.ts b/src/zerion/install.ts index ba82217..d22f24e 100644 --- a/src/zerion/install.ts +++ b/src/zerion/install.ts @@ -5,7 +5,7 @@ import { ZERION_GITHUB_API, RECOMMENDED_ZERION_VERSIONS } from '../constants'; -import { logSuccess, logError, logInfo } from '../log'; +import { logSuccess, logInfo } from '../log'; import { Asset } from '../types'; import { compareVersion, @@ -19,24 +19,20 @@ import { } from '../wallet/install'; export async function install(directory: string, version: string = DEFAULT_ZERION_VERSION): Promise { - try { - const assetName = `${DEFAULT_ZERION_ASSET}-v${version}`; - let destDir: string = `${directory}/${assetName}`; - const exists = fileExists(destDir); - if (exists) { - logInfo(`Zerion version already exists in ${destDir}`); - return destDir; - } - compareVersion(ZERION, version, RECOMMENDED_ZERION_VERSIONS); - const release: any = await fetchGithubRelease(ZERION, version, ZERION_GITHUB_API); - const asset: Asset = findGithubAsset(assetName, release); - createDirectory(directory); - const fileName: string = await downloadAssetZipFile(asset, directory); - destDir = extractZipContents(fileName); - moveFiles(destDir); - logSuccess(`Installed Zerion version \n${destDir}`); + const assetName = `${DEFAULT_ZERION_ASSET}-v${version}`; + let destDir: string = `${directory}/${assetName}`; + const exists = fileExists(destDir); + if (exists) { + logInfo(`Zerion version already exists in ${destDir}`); return destDir; - } catch (error: any) { - logError(error.message); } + compareVersion(ZERION, version, RECOMMENDED_ZERION_VERSIONS); + const release: any = await fetchGithubRelease(ZERION, version, ZERION_GITHUB_API); + const asset: Asset = findGithubAsset(assetName, release); + createDirectory(directory); + const fileName: string = await downloadAssetZipFile(asset, directory); + destDir = extractZipContents(fileName); + moveFiles(destDir); + logSuccess(`Installed Zerion version \n${destDir}`); + return destDir; }