Detect executable with file(1)

Signed-off-by: Paul Guyot <pguyot@kallisys.net>

Author: pguyot

.github/workflows/build-and-test.yaml

@@ -10,15 +10,17 @@ on: [push, pull_request]
 
 jobs:
   build-and-test:
-    runs-on: "ubuntu-24.04"
+    runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         otp: ["25", "26", "27", "28"]
+        os: ["ubuntu-24.04", "ubuntu-24.04-arm", "macos-26", "macos-15-intel"]
 
         include:
           - otp: "25"
             make_jobs: "compile etest"
-            rebar3_version: "3.24.0 "
+            rebar3_version: "3.24.0"
           - otp: "26"
             make_jobs: "all"
             rebar3_version: "3.25.1"
@@ -31,20 +33,46 @@ jobs:
 
     steps:
     # Builder info
-    - name: "System info"
+    - name: "Install deps"
+      if: startsWith(matrix.os, 'macos-') && matrix.otp != '25'
       run: |
-        echo "**uname:**"
-        uname -a
-        echo "**OTP version:**"
-        cat $(dirname $(which erlc))/../releases/RELEASES || true
+        brew update && HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install gperf ninja llvm erlang@${{ matrix.otp }} rebar3
+        echo PATH="/usr/local/opt/llvm/bin:/opt/homebrew/opt/llvm/bin:$PATH" >> $GITHUB_ENV
+
+    - name: "Install deps"
+      if: startsWith(matrix.os, 'macos-') && matrix.otp == '25'
+      run: |
+        brew update
+        HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install gperf ninja llvm erlang@${{ matrix.otp }}
+        wget https://github.com/erlang/rebar3/releases/download/${{ matrix.rebar3_version }}/rebar3
+        chmod +x rebar3
+        for bin_dir in {/usr/local,/opt/homebrew}/opt/erlang@25/bin/ ; do
+            if [ -e ${bin_dir} ]; then
+                sudo cp rebar3 ${bin_dir}
+            fi
+        done
+        echo PATH="/usr/local/opt/llvm/bin:/opt/homebrew/opt/llvm/bin:/usr/local/opt/erlang@${{ matrix.otp }}/bin:/opt/homebrew/opt/erlang@${{ matrix.otp }}/bin:$PATH" >> $GITHUB_ENV
+
+    - name: "Install deps"
+      if: startsWith(matrix.os, 'ubuntu-')
+      run: |
+        sudo apt install -y make git gcc-14 g++-14 cmake gperf zlib1g-dev libmbedtls-dev ninja-build
 
     # Setup OTP
     - name: "Setup OTP"
+      if: startsWith(matrix.os, 'ubuntu-')
       uses: erlef/setup-beam@v1
       with:
         otp-version: ${{ matrix.otp }}
         rebar3-version: ${{ matrix.rebar3_version }}
 
+    - name: "System info"
+      run: |
+        echo "**uname:**"
+        uname -a
+        echo "**OTP version:**"
+        cat $(dirname $(which erlc))/../releases/RELEASES || true
+
     # Checkout AtomVM
     - name: "Checkout AtomVM"
       uses: actions/checkout@v5
@@ -53,18 +81,14 @@ jobs:
         path: 'atomvm'
         submodules: 'recursive'
 
-    - name: "Install deps"
-      run: |
-        sudo apt install -y make git gcc-14 g++-14 cmake gperf zlib1g-dev libmbedtls-dev ninja-build
-
     - name: "Install AtomVM"
       working-directory: 'atomvm'
       run: |
         mkdir build
         cd build
         cmake -DAVM_BUILD_RUNTIME_ONLY=ON -G Ninja ..
-        ninja
-        sudo ninja install
+        cmake --build .
+        sudo cmake --build . -t install
         atomvm -v
 
     # Setup

src/atomvm_escriptize_provider.erl

@@ -235,32 +235,24 @@ find_atomvm_binary() ->
 
 %% @private
 resolve_atomvm_binary(Path) ->
-    % Try to read the file to see if it's a shell script
-    case file:read_file(Path) of
-        {ok, Content} ->
-            case binary:part(Content, 0, 9) of
-                <<"#!/bin/sh">> ->
-                    % It's a shell script, parse it to find the actual binary
-                    % The standard wrapper is at /prefix/bin/atomvm
-                    % The actual binary is at /prefix/lib/atomvm/AtomVM
-                    Dir = filename:dirname(Path),
-                    Prefix = filename:dirname(Dir),
-                    ActualBinary = filename:join([Prefix, "lib", "atomvm", "AtomVM"]),
-                    case filelib:is_file(ActualBinary) of
-                        true -> {ok, ActualBinary};
-                        false -> {error, not_found}
-                    end;
-                <<_:8, $e, $l, $f, _:40>> ->
-                    % It's the actual binary
-                    case filelib:is_file(Path) of
-                        true -> {ok, Path};
-                        false -> {error, not_found}
-                    end;
-                _ ->
-                    {error, not_a_script}
+    case string:trim(os:cmd("file -b --mime-type " ++ Path)) of
+        "text/x-shellscript" ->
+            % It's a shell script, suppose
+            % The standard wrapper is at /prefix/bin/atomvm
+            % The actual binary is at /prefix/lib/atomvm/AtomVM
+            Dir = filename:dirname(Path),
+            Prefix = filename:dirname(Dir),
+            ActualBinary = filename:join([Prefix, "lib", "atomvm", "AtomVM"]),
+            case filelib:is_file(ActualBinary) of
+                true -> {ok, ActualBinary};
+                false -> {error, not_found}
             end;
-        {error, Reason} ->
-            {error, Reason}
+        "application/x-mach-binary" ->
+            {ok, Path};
+        "application/x-elf" ->
+            {ok, Path};
+        Other ->
+            {error, {unexpected, Other}}
     end.
 
 %% @private
@@ -281,7 +273,7 @@ find_objcopy() ->
     Tools =
         case os:type() of
             {unix, darwin} ->
-                % On macOS, prefer llvm-objcopy and try MacPorts variants
+                % On macOS, prefer llvm-objcopy (Homebrew) and try MacPorts variants
                 [
                     "llvm-objcopy",
                     "llvm-objcopy-mp-21",
@@ -296,8 +288,11 @@ find_objcopy() ->
                 ["objcopy", "llvm-objcopy"]
         end,
     case find_first_executable(Tools) of
-        {ok, Path} -> {ok, Path};
-        error -> {error, "No objcopy tool found. Please install llvm or binutils"}
+        {ok, Path} ->
+            {ok, Path};
+        error ->
+            {error,
+                "No objcopy tool found. Please install llvm or binutils and ensure objcopy or llvm-objcopy is on the PATH"}
     end.
 
 %% @private