From e5c5c08de67d199407d82252e3a5c24a560d0e85 Mon Sep 17 00:00:00 2001
From: Leland Lucius <github@homerow.net>
Date: Mon, 24 Feb 2020 08:55:20 -0600
Subject: [PATCH] Fixes for Linux and Mac builds

Adding "apt-get update" to hopefully fix the Linux build. I thought
Github would "fix" the image, but it doesn't hurt to have the update
in there anyway.

And fix the Mac Info.plist version.
---
 .github/workflows/cmake_build.yml | 1 +
 src/CMakeLists.txt                | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cmake_build.yml b/.github/workflows/cmake_build.yml
index 35c8915d4..cfcc63390 100644
--- a/.github/workflows/cmake_build.yml
+++ b/.github/workflows/cmake_build.yml
@@ -249,6 +249,7 @@ jobs:
         export LD_LIBRARY_PATH="/usr/local/lib"
 
         # Install required packages
+        sudo apt-get update -y
         sudo apt-get install -y libgtk2.0-dev libasound2-dev gettext
         sudo apt-get remove -y ccache
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8b4fb40af..d4030c556 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1250,9 +1250,9 @@ elseif( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
 
    # And store as variables
    foreach( line ${output} )
-      string( REPLACE " " ";" line ${line})
-      list( GET line 0 name )
-      list( GET line 1 value )
+      string( REGEX MATCHALL "[A-Za-z0-9_]+" line "${line}" )
+      list( GET line 1 name )
+      list( GET line 2 value )
       set( ${name} ${value} )
    endforeach()