Merge pull request #416 from MikeMcQuaid/strap-repository

strap.sh: handle rerunning Strap.
MikeMcQuaid · Mar 6, 2021 · 83858f2 · 83858f2
2 parents eb60444 + 95fc62b
commit 83858f2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -27,6 +27,12 @@ jobs:
           STRAP_CI: 1
           STRAP_DEBUG: 1
 
+      - name: Rerun bin/strap.sh
+        run: bin/strap.sh
+        env:
+          STRAP_CI: 1
+          STRAP_DEBUG: 1
+
       - run: brew config
 
       - run: brew doctor

diff --git a/bin/strap.sh b/bin/strap.sh
@@ -273,7 +273,8 @@ logk
 # Setup Homebrew directory and permissions.
 logn "Installing Homebrew:"
 HOMEBREW_PREFIX="$(brew --prefix 2>/dev/null || true)"
-if [ -z "$HOMEBREW_PREFIX" ]; then
+HOMEBREW_REPOSITORY="$(brew --repository 2>/dev/null || true)"
+if [ -z "$HOMEBREW_PREFIX" ] || [ -z "$HOMEBREW_REPOSITORY" ]; then
   UNAME_MACHINE="$(/usr/bin/uname -m)"
   if [[ "$UNAME_MACHINE" == "arm64" ]]; then
     HOMEBREW_PREFIX="/opt/homebrew"