fix: bin installation from git (#1667)

.changeset/beige-actors-march.md

@@ -0,0 +1,6 @@
+---
+"@fuel-ts/forc": patch
+"@fuel-ts/fuel-core": patch
+---
+
+Fixing installation from git branches

packages/forc/lib/bin.js

@@ -3,7 +3,7 @@
 import { spawn } from 'child_process';
 
 // eslint-disable-next-line import/extensions
-import binPath from './index.js';
+import { binPath } from './shared.js';
 
 const args = process.argv.slice(2);
 spawn(binPath, args, { stdio: 'inherit' }).on('exit', process.exit);

packages/forc/lib/install.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 
 import { execSync } from 'child_process';
+import { error } from 'console';
 import { existsSync, rmSync, writeFileSync } from 'fs';
 import fetch from 'node-fetch';
 import { join } from 'path';
-import tar from 'tar';
 
 import {
   __dirname,
@@ -53,12 +53,9 @@ import {
     writeFileSync(pkgPath, buf);
 
     // Extract
-    await tar.x({
-      file: pkgPath,
-      C: binDir,
-    });
+    execSync(`tar xzf "${pkgPath}" -C "${binDir}"`);
 
     // Cleanup
     rmSync(pkgPath);
   }
-})().catch((e) => console.error(e));
+})().catch((e) => error(e));

packages/forc/lib/shared.js

@@ -1,12 +1,13 @@
 import { execSync } from 'child_process';
-import { cpSync } from 'fs';
-import fs from 'fs/promises';
-import path, { join, dirname } from 'path';
+import { cpSync, mkdirSync, rmSync, readFileSync, writeFileSync } from 'fs';
+import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export const __dirname = dirname(fileURLToPath(import.meta.url));
 
+export const binPath = join(__dirname, '../forc-binaries/forc');
+
 const platforms = {
   darwin: {
     arm64: 'darwin_arm64',
@@ -18,10 +19,6 @@ const platforms = {
   },
 };
 
-const binPath = join(__dirname, '../forc-binaries/forc');
-
-export default binPath;
-
 export const getPkgPlatform = () => {
   if (process.platform !== 'darwin' && process.platform !== 'linux') {
     throw new Error(
@@ -36,28 +33,28 @@ export const getPkgPlatform = () => {
   return platforms[process.platform][process.arch];
 };
 
-const versionFilePath = path.join(__dirname, '../VERSION');
+const versionFilePath = join(__dirname, '../VERSION');
 
-export const getCurrentVersion = async () => {
-  const versionContents = await fs.readFile(versionFilePath, 'utf8');
+export const getCurrentVersion = () => {
+  const versionContents = readFileSync(versionFilePath, 'utf8');
   const forcVersion = versionContents.match(/^.+$/m)?.[0] || versionContents;
   return forcVersion;
 };
 
-export const setCurrentVersion = async (version) => {
-  await fs.writeFile(versionFilePath, version);
+export const setCurrentVersion = (version) => {
+  writeFileSync(versionFilePath, version);
 };
 
 export const isGitBranch = (versionFileContents) => versionFileContents.indexOf('git:') !== -1;
 
 const swayRepoUrl = 'https://github.com/fuellabs/sway.git';
 
 export const buildFromGitBranch = (branchName) => {
-  fs.rmSync('sway-repo', { recursive: true, force: true });
-  fs.rmSync('forc-binaries', { recursive: true, force: true });
+  rmSync('sway-repo', { recursive: true, force: true });
+  rmSync('forc-binaries', { recursive: true, force: true });
   execSync(`git clone --branch ${branchName} ${swayRepoUrl} sway-repo`);
   execSync(`cd sway-repo && cargo build`);
-  fs.mkdirSync('forc-binaries');
+  mkdirSync('forc-binaries');
   cpSync('sway-repo/target/debug/forc', 'forc-binaries');
   cpSync('sway-repo/target/debug/forc-deploy', 'forc-binaries');
   cpSync('sway-repo/target/debug/forc-doc', 'forc-binaries');
@@ -66,5 +63,5 @@ export const buildFromGitBranch = (branchName) => {
   cpSync('sway-repo/target/debug/forc-run', 'forc-binaries');
   cpSync('sway-repo/target/debug/forc-submit', 'forc-binaries');
   cpSync('sway-repo/target/debug/forc-tx', 'forc-binaries');
-  fs.rmSync('sway-repo', { recursive: true, force: true });
+  rmSync('sway-repo', { recursive: true, force: true });
 };

packages/forc/package.json

@@ -17,10 +17,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "node-fetch": "^2.6.7",
-    "tar": "^6.2.0"
-  },
-  "devDependencies": {
-    "@types/tar": "^6.1.8"
+    "node-fetch": "^2.6.7"
   }
 }

packages/fuel-core/lib/bin.js

@@ -3,7 +3,7 @@
 import { spawn } from 'child_process';
 
 // eslint-disable-next-line import/extensions
-import binPath from './index.js';
+import { binPath } from './shared.js';
 
 const args = process.argv.slice(2);
 spawn(binPath, args, { stdio: 'inherit' }).on('exit', process.exit);

packages/fuel-core/lib/install.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 
 import { execSync } from 'child_process';
+import { error } from 'console';
 import { existsSync, rmSync, writeFileSync, mkdirSync, renameSync } from 'fs';
 import fetch from 'node-fetch';
 import { join } from 'path';
-import tar from 'tar';
 
 import {
   __dirname,
@@ -66,12 +66,10 @@ import {
     writeFileSync(pkgPath, buf);
 
     // Extract
-    await tar.x({
-      file: pkgPath,
-      C: rootDir,
-    });
+    execSync(`tar xzf "${pkgPath}" -C "${rootDir}"`);
 
-    // Take the contents of the directory containing the extracted binaries and move them to the `fuel-core-binaries` directory
+    // Take the contents of the directory containing the extracted
+    // binaries and move them to the `fuel-core-binaries` directory
     renameSync(`${fileName}`, binDir);
 
     // Cleanup
@@ -81,4 +79,4 @@ import {
     });
     rmSync(pkgPath);
   }
-})().catch((e) => console.error(e));
+})().catch((e) => error(e));

packages/fuel-core/lib/shared.js

@@ -1,12 +1,13 @@
 import { execSync } from 'child_process';
-import { cpSync, rmSync } from 'fs';
-import fs from 'fs/promises';
+import { cpSync, mkdirSync, rmSync, readFileSync, writeFileSync } from 'fs';
 import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export const __dirname = dirname(fileURLToPath(import.meta.url));
 
+export const binPath = join(__dirname, '../fuel-core-binaries/fuel-core');
+
 const platforms = {
   darwin: {
     arm64: 'aarch64-apple-darwin',
@@ -34,13 +35,13 @@ export const getPkgPlatform = () => {
 
 const versionFilePath = join(__dirname, '../VERSION');
 
-export const getCurrentVersion = async () => {
-  const fuelCoreVersion = await fs.readFile(versionFilePath, 'utf8');
+export const getCurrentVersion = () => {
+  const fuelCoreVersion = readFileSync(versionFilePath, 'utf8');
   return fuelCoreVersion.trim();
 };
 
-export const setCurrentVersion = async (version) => {
-  await fs.writeFile(versionFilePath, version);
+export const setCurrentVersion = (version) => {
+  writeFileSync(versionFilePath, version);
 };
 
 export const isGitBranch = (versionFileContents) => versionFileContents.indexOf('git:') !== -1;
@@ -52,7 +53,7 @@ export const buildFromGitBranch = (branchName) => {
   rmSync('fuel-core-binaries', { recursive: true, force: true });
   execSync(`git clone --branch ${branchName} ${fuelCoreRepoUrl} fuel-core-repo`, { silent: true });
   execSync(`cd fuel-core-repo && cargo build`, { silent: true });
-  fs.mkdirSync('fuel-core-binaries');
+  mkdirSync('fuel-core-binaries');
   cpSync('fuel-core-repo/target/debug/fuel-core', 'fuel-core-binaries/fuel-core');
   rmSync('fuel-core-repo', { recursive: true, force: true });
 };

packages/fuel-core/package.json

@@ -17,10 +17,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "node-fetch": "^2.7.0",
-    "tar": "^6.2.0"
-  },
-  "devDependencies": {
-    "@types/tar": "^6.1.8"
+    "node-fetch": "^2.7.0"
   }
 }