From 7842fde0bf087c0199151637f45b5d89d069c133 Mon Sep 17 00:00:00 2001 From: CsBigDataHub Date: Fri, 18 Jul 2025 11:02:22 -0400 Subject: [PATCH 1/2] fix(sw version issue): prevent nil error for major and minor version parsing update major and minor methods to safely handle nil values in @version hash ensure integer conversion only when keys exist, otherwise default to 0 prevents exceptions if @version or keys are missing --- build-emacs-for-macos | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-emacs-for-macos b/build-emacs-for-macos index c504ab4..ce25989 100755 --- a/build-emacs-for-macos +++ b/build-emacs-for-macos @@ -164,11 +164,11 @@ class AbstractVersion end def major - @major ||= @version[:major]&.to_i + @major ||= (@version && @version[:major]) ? @version[:major].to_i : 0 end def minor - @minor ||= @version[:minor]&.to_i + @minor ||= (@version && @version[:minor]) ? @version[:minor].to_i : 0 end def patch From df151f5f3c13f35372ee18a3deb0450f7028ef8b Mon Sep 17 00:00:00 2001 From: CsBigDataHub Date: Fri, 18 Jul 2025 12:08:32 -0400 Subject: [PATCH 2/2] Update build-emacs-for-macos --- build-emacs-for-macos | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build-emacs-for-macos b/build-emacs-for-macos index ce25989..518ace0 100755 --- a/build-emacs-for-macos +++ b/build-emacs-for-macos @@ -150,9 +150,11 @@ class AbstractVersion attr_reader :version def initialize - @version = load_version.match( + str = load_version.strip + @version = str.match( /(?\d+)(?:\.(?\d+)(?:\.(?\d+))?)?/ ) + warn "Parsed OS version string: '#{str}' => #{@version ? @version[0] : 'NIL'}" end def load_version @@ -172,7 +174,7 @@ class AbstractVersion end def patch - @patch ||= @version[:patch]&.to_i + @patch ||= (@version && @version[:patch]) ? @version[:patch].to_i : 0 end end