Launch elf interpreter explicitly on nixos

Author: ntkme

exe/sass

@@ -6,15 +6,7 @@ require_relative '../ext/sass/cli'
 module Sass
   # The `sass` command line interface
   module CLI
-    begin
-      Kernel.exec(*COMMAND, *ARGV)
-    rescue Errno::ENOENT
-      require_relative '../lib/sass/elf'
-
-      raise if ELF::INTERPRETER.nil?
-
-      Kernel.exec(ELF::INTERPRETER, *COMMAND, *ARGV)
-    end
+    Kernel.exec(*COMMAND, *ARGV)
   end
 
   private_constant :CLI

ext/sass/Rakefile

@@ -30,6 +30,8 @@ rescue StandardError
 end
 
 file 'cli.rb' => %w[dart-sass] do |t|
+  require_relative '../../lib/sass/elf'
+
   exe = 'dart-sass/sass'
   exe = "#{exe}#{['', '.bat', '.exe'].find { |ext| File.exist?("#{exe}#{ext}") }}"
 
@@ -39,28 +41,57 @@ file 'cli.rb' => %w[dart-sass] do |t|
   runtime = "#{runtime}#{['', '.exe'].find { |ext| File.exist?("#{runtime}#{ext}") }}"
   snapshot = 'dart-sass/src/sass.snapshot'
 
-  command = if File.exist?(runtime) && File.exist?(snapshot)
-              "
+  if File.exist?(runtime) && File.exist?(snapshot)
+    command = "
       File.absolute_path('#{runtime}', __dir__).freeze,
       File.absolute_path('#{snapshot}', __dir__).freeze
     "
-            else
-              "
+    interpreter = File.open(runtime, 'rb') do |file|
+      Sass.const_get(:ELF).new(file).interpreter
+    rescue ArgumentError
+      nil
+    end
+  else
+    command = "
       File.absolute_path('#{exe}', __dir__).freeze
     "
-            end
+    interpreter = nil
+  end
 
-  File.write(t.name, <<~CLI_RB)
-    # frozen_string_literal: true
+  if interpreter.nil?
+    File.write(t.name, <<~CLI_RB)
+      # frozen_string_literal: true
 
-    module Sass
-      module CLI
-        COMMAND = [#{command}].freeze
+      module Sass
+        # The [CLI] module.
+        module CLI
+          COMMAND = [#{command}].freeze
+        end
+
+        private_constant :CLI
       end
+    CLI_RB
+  else
+    File.write(t.name, <<~CLI_RB)
+      # frozen_string_literal: true
 
-      private_constant :CLI
-    end
-  CLI_RB
+      require_relative '../../lib/sass/elf'
+
+      module Sass
+        # The [CLI] module.
+        module CLI
+          INTERPRETER = '#{interpreter}'
+
+          COMMAND = [
+            *(ELF::INTERPRETER unless ELF::INTERPRETER.nil? ||
+                                      ELF::INTERPRETER == INTERPRETER ||
+                                      File.basename(ELF::INTERPRETER) != File.basename(INTERPRETER)),#{command}].freeze
+        end
+
+        private_constant :CLI
+      end
+    CLI_RB
+  end
 end
 
 file 'embedded_sass.proto' => %w[cli.rb] do |t|

lib/sass/compiler/connection.rb

@@ -12,15 +12,7 @@ class Compiler
     class Connection
       def initialize
         @mutex = Mutex.new
-        @stdin, @stdout, @stderr, @wait_thread = begin
-          Open3.popen3(*CLI::COMMAND, '--embedded', chdir: __dir__)
-        rescue Errno::ENOENT
-          require_relative '../elf'
-
-          raise if ELF::INTERPRETER.nil?
-
-          Open3.popen3(ELF::INTERPRETER, *CLI::COMMAND, '--embedded', chdir: __dir__)
-        end
+        @stdin, @stdout, @stderr, @wait_thread = Open3.popen3(*CLI::COMMAND, '--embedded', chdir: __dir__)
 
         @stdin.binmode
 

lib/sass/elf.rb

@@ -147,7 +147,7 @@ def initialize(buffer)
         elf_ehdr = :Elf64_Ehdr
         elf_phdr = :Elf64_Phdr
       else
-        raise ArgumentError
+        raise EncodingError
       end
 
       case @ehdr[:e_ident][EI_DATA]
@@ -156,7 +156,7 @@ def initialize(buffer)
       when ELFDATA2MSB
         little_endian = false
       else
-        raise ArgumentError
+        raise EncodingError
       end
 
       @ehdr.merge!(read(elf_ehdr, little_endian))
@@ -189,7 +189,7 @@ def interpreter
 
       @buffer.seek(phdr[:p_offset], IO::SEEK_SET)
       interpreter = @buffer.read(phdr[:p_filesz])
-      raise ArgumentError unless interpreter.end_with?("\0")
+      raise EncodingError unless interpreter.end_with?("\0")
 
       interpreter.chomp!("\0")
     end
@@ -215,7 +215,7 @@ def read(type, little_endian)
           end
         end
       end
-    end
+    end.freeze
   end
 
   private_constant :ELF