From 46109c38d1da55272af9b318476d0144a6d717d3 Mon Sep 17 00:00:00 2001
From: Stephen G Tuggy <sgt@stephengtuggy.com>
Date: Thu, 25 Apr 2024 00:40:31 -0700
Subject: [PATCH] Update bootstrap-on-macos.sh and brew-install-for-cmake.sh.
 Also comment out Rocky Linux 8.9 CI builds for now.

---
 .github/workflows/gh-actions-pr.yml      | 10 +++++-----
 .github/workflows/gh-actions-release.yml | 10 +++++-----
 script/bootstrap-on-macos.sh             |  4 ++--
 script/brew-install-for-cmake.sh         |  0
 4 files changed, 12 insertions(+), 12 deletions(-)
 mode change 100644 => 100755 script/brew-install-for-cmake.sh

diff --git a/.github/workflows/gh-actions-pr.yml b/.github/workflows/gh-actions-pr.yml
index e5d7d1264..99afb99d4 100644
--- a/.github/workflows/gh-actions-pr.yml
+++ b/.github/workflows/gh-actions-pr.yml
@@ -116,11 +116,11 @@ jobs:
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'ON'
             allow_failure: false
-          - FROM:     'rockylinux:8.9'
-            COMPILER: 'clang'
-            OpenGL_GL_PREFERENCE: 'GLVND'
-            ENABLE_PIE: 'ON'
-            allow_failure: false
+          #- FROM:     'rockylinux:8.9'
+          #  COMPILER: 'clang'
+          #  OpenGL_GL_PREFERENCE: 'GLVND'
+          #  ENABLE_PIE: 'ON'
+          #  allow_failure: false
           #- FROM:     'manjarolinux/base'
           #  COMPILER: 'clang'
           #  OpenGL_GL_PREFERENCE: 'LEGACY'
diff --git a/.github/workflows/gh-actions-release.yml b/.github/workflows/gh-actions-release.yml
index bf3bef58b..0cff70cbc 100644
--- a/.github/workflows/gh-actions-release.yml
+++ b/.github/workflows/gh-actions-release.yml
@@ -91,11 +91,11 @@ jobs:
             OpenGL_GL_PREFERENCE: 'GLVND'
             ENABLE_PIE: 'ON'
             ARTIFACT_EXT: 'rpm'
-          - FROM:     'rockylinux:8.9'
-            COMPILER: 'clang'
-            OpenGL_GL_PREFERENCE: 'GLVND'
-            ENABLE_PIE: 'ON'
-            ARTIFACT_EXT: 'rpm'
+          #- FROM:     'rockylinux:8.9'
+          #  COMPILER: 'clang'
+          #  OpenGL_GL_PREFERENCE: 'GLVND'
+          #  ENABLE_PIE: 'ON'
+          #  ARTIFACT_EXT: 'rpm'
 
     steps:
       - name: Check out repository
diff --git a/script/bootstrap-on-macos.sh b/script/bootstrap-on-macos.sh
index 9b8177240..0058c4128 100644
--- a/script/bootstrap-on-macos.sh
+++ b/script/bootstrap-on-macos.sh
@@ -38,7 +38,7 @@ brew update
 
 for j in "${packages_to_install[@]}"
 do
-    brew install "$j"
+    brew list "$j" &>/dev/null || brew install "$j"
     PACKAGE_INSTALLED_PREFIX=$(brew --prefix "$j")
     PACKAGE_INSTALLED_BIN="$PACKAGE_INSTALLED_PREFIX/bin"
     export PATH="$PACKAGE_INSTALLED_BIN:$PATH"
@@ -47,5 +47,5 @@ done
 
 ln -s /usr/local/include/GL /usr/local/include/OpenGL
 ln -s /usr/local/include/GL /usr/local/include/GLUT
-OPENALDIR=$(brew --prefix openal-soft)
+OPENALDIR="$(brew --prefix openal-soft)"
 export OPENALDIR
diff --git a/script/brew-install-for-cmake.sh b/script/brew-install-for-cmake.sh
old mode 100644
new mode 100755