Merge pull request #3130 from lilyinstarlight/feature/rpi-issue-detection

Spider - check for the existence of /etc/rpi-issue to identify Raspberry Pi OS

Author: samaaron

app/server/ruby/bin/compile-extensions.rb

@@ -20,10 +20,12 @@
 require 'rbconfig'
 ruby_api = RbConfig::CONFIG['ruby_version']
 os = case RUBY_PLATFORM
-     when /.*arm.*-linux.*/
-       :raspberry
      when /.*linux.*/
-       :linux
+       if File.exist?('/etc/rpi-issue')
+         :raspberry
+       else
+         :linux
+       end
      when /.*darwin.*/
        :osx
      when /.*mingw.*/

app/server/ruby/bin/daemon.rb

@@ -627,12 +627,12 @@ def self.log_error(e)
 
       def self.os
         case RUBY_PLATFORM
-        when /.*arm.*-linux.*/
-          :raspberry
-        when /aarch64.*linux.*/
-          :raspberry
         when /.*linux.*/
-          :linux
+          if File.exist?('/etc/rpi-issue')
+            :raspberry
+          else
+            :linux
+          end
         when /.*darwin.*/
           :macos
         when /.*mingw.*/

app/server/ruby/lib/sonicpi/util.rb

@@ -19,12 +19,12 @@ module SonicPi
   module Util
     # Check which OS we're on
     case RUBY_PLATFORM
-    when /.*arm.*-linux.*/
-      @@os = :raspberry
-    when /aarch64.*linux.*/
-      @@os = :raspberry
     when /.*linux.*/
-      @@os = :linux
+      if File.exist?('/etc/rpi-issue')
+        @@os = :raspberry
+      else
+        @@os = :linux
+      end
     when /.*darwin.*/
       @@os = :osx
     when /.*mingw.*/