feat: add INSTALL_FUSE_T env

cnpm · Oct 25, 2023 · aed2bfa · aed2bfa
1 parent 6d38c78
commit aed2bfa
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -181,11 +181,6 @@ jobs:
       - name: Change directory ownership
         run: chown -R $(id -un):$(id -gn) .
 
-      - name: Install macfuse
-        run: |
-          wget https://github.com/macos-fuse-t/fuse-t/releases/download/1.0.24/fuse-t-macos-installer-1.0.24.pkg
-          sudo installer -pkg fuse-t-macos-installer-1.0.24.pkg -target /
-
       - name: Rust Cache
         uses: actions/cache@v3
         with:
@@ -205,6 +200,6 @@ jobs:
           CARGO_BUILD_TARGET=x86_64-apple-darwin BUILD_OS=macos BUILD_ARCH=amd64 npm run init:ci
 
       - name: Run CI
-        run: npm run test:integration
+        run: INSTALL_FUSE_T=true npm run test:integration
         env:
           NODE_OPTIONS: --max_old_space_size=6144
diff --git a/packages/cli/bin/rapid.js b/packages/cli/bin/rapid.js
@@ -7,6 +7,7 @@ const yargs = require('yargs');
 const { NpmFsMode, NYDUS_TYPE } = require('../lib/constants.js');
 const util = require('../lib/util');
 const path = require('node:path');
+const fuse_t = require('../lib/fuse_t');
 
 yargs
   .command({
@@ -31,6 +32,11 @@ yargs
       const cwd = process.cwd();
       const pkgRes = await util.readPkgJSON();
       const pkg = pkgRes?.pkg || {};
+      if (!(await fuse_t.checkFuseT())) {
+        if (await fuse_t.confirmInstallFuseT()) {
+          await fuse_t.installFuseT();
+        }
+      }
 
       await util.shouldFuseSupport();
       await install({

diff --git a/packages/cli/lib/fuse_t.js b/packages/cli/lib/fuse_t.js
@@ -30,6 +30,8 @@ exports.installFuseT = async function installFuseT() {
 };
 
 exports.confirmInstallFuseT = async function confirmInstallFuseT() {
+  if (process.env.INSTALL_FUSE_T === 'true') return true;
+  if (!process.stdout.isTTY) return false;
   const answers = await inquirer.prompt([{
     type: 'confirm',
     name: 'installFuseT',

diff --git a/packages/cli/lib/util.js b/packages/cli/lib/util.js
@@ -24,7 +24,7 @@ const {
   nydusdBootstrapFile,
   nydusdMnt,
 } = require('./constants');
-let confirmed = false;
+const fuse_t = require('./fuse_t');
 
 // node_modules/a -> a
 // node_mdoules/@scope/b -> @scope/b
@@ -106,22 +106,7 @@ async function shouldFuseSupport() {
 
   if (os.type() === 'Darwin') {
     const fuseTInstalled = await fuse_t.checkFuseT();
-    if (fuseTInstalled) {
-      return;
-    }
-    if (confirmed) {
-      throw new NotSupportedError('install fuse-t first.');
-    }
-    const confirmInstallFuseT = await fuse_t.confirmInstallFuseT();
-    confirmed = true;
-    if (!confirmInstallFuseT) {
-      throw new NotSupportedError('install fuse-t first.');
-    }
-    try {
-      await fuse_t.installFuseT();
-    } catch (error) {
-      error.message = '[rapid] install fuse-t failed: ' + error.message;
-      console.warn(error);
+    if (!fuseTInstalled) {
       throw new NotSupportedError('install fuse-t first.');
     }
   }