fix homebrew install directory is different on M1 Mac (fix #28)

rhysd · Jan 31, 2024 · 3d762c0 · 3d762c0
1 parent 7465f8d
commit 3d762c0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/scripts/post_action_check.ts b/scripts/post_action_check.ts
@@ -33,7 +33,11 @@ function expectedExecutable(neovim: boolean, ver: string): string {
         switch (process.platform) {
             case 'darwin':
                 if (ver === 'stable') {
-                    return '/usr/local/bin/nvim';
+                    if (process.arch === 'arm64') {
+                        return '/opt/homebrew/bin/nvim';
+                    } else {
+                        return '/usr/local/bin/nvim';
+                    }
                 } else {
                     // nightly or specific version
                     return path.join(homedir(), `nvim-${ver}/bin/nvim`);
@@ -50,7 +54,11 @@ function expectedExecutable(neovim: boolean, ver: string): string {
         switch (process.platform) {
             case 'darwin':
                 if (ver === 'stable') {
-                    return '/usr/local/bin/vim';
+                    if (process.arch === 'arm64') {
+                        return '/opt/homebrew/bin/vim';
+                    } else {
+                        return '/usr/local/bin/vim';
+                    }
                 } else {
                     // nightly or specific version
                     return path.join(homedir(), `vim-${ver}/bin/vim`);

diff --git a/src/install_macos.ts b/src/install_macos.ts
@@ -5,12 +5,16 @@ import { exec } from './shell';
 import { buildVim } from './vim';
 import { buildNightlyNeovim, downloadNeovim } from './neovim';
 
+function homebrewBinDir(): string {
+    return process.arch === 'arm64' ? '/opt/homebrew/bin' : '/usr/local/bin';
+}
+
 async function installVimStable(): Promise<Installed> {
     core.debug('Installing stable Vim on macOS using Homebrew');
     await exec('brew', ['install', 'macvim']);
     return {
         executable: 'vim',
-        binDir: '/usr/local/bin',
+        binDir: homebrewBinDir(),
     };
 }
 
@@ -19,7 +23,7 @@ async function installNeovimStable(): Promise<Installed> {
     await exec('brew', ['install', 'neovim']);
     return {
         executable: 'nvim',
-        binDir: '/usr/local/bin',
+        binDir: homebrewBinDir(),
     };
 }