From 93a28a067913c55c298992b7c3d34542b03c5451 Mon Sep 17 00:00:00 2001 From: Brandon Valentine Date: Tue, 17 Oct 2017 15:54:20 -0500 Subject: [PATCH 1/2] Improve test for existing Brewfile --- bin/strap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/strap.sh b/bin/strap.sh index b055680e8..3d02601cc 100755 --- a/bin/strap.sh +++ b/bin/strap.sh @@ -297,7 +297,7 @@ if [ -n "$STRAP_GITHUB_USER" ]; then fi # Setup Brewfile -if [ -n "$STRAP_GITHUB_USER" ] && ! [ -f "$HOME/.Brewfile" ]; then +if [ -n "$STRAP_GITHUB_USER" ] && ( [ ! -f "$HOME/.Brewfile" ] || [ "$HOME/.Brewfile" -ef "$HOME/.homebrew-bundle/Brewfile" ] ); then HOMEBREW_BREWFILE_URL="https://github.com/$STRAP_GITHUB_USER/homebrew-brewfile" if git ls-remote "$HOMEBREW_BREWFILE_URL" &>/dev/null; then From 0f90b154c3a81c89330b9cec8919a1ba461c5f2c Mon Sep 17 00:00:00 2001 From: Brandon Valentine Date: Fri, 20 Oct 2017 16:39:38 -0500 Subject: [PATCH 2/2] Correct typo in test --- bin/strap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/strap.sh b/bin/strap.sh index 3d02601cc..3d172c1c7 100755 --- a/bin/strap.sh +++ b/bin/strap.sh @@ -297,7 +297,7 @@ if [ -n "$STRAP_GITHUB_USER" ]; then fi # Setup Brewfile -if [ -n "$STRAP_GITHUB_USER" ] && ( [ ! -f "$HOME/.Brewfile" ] || [ "$HOME/.Brewfile" -ef "$HOME/.homebrew-bundle/Brewfile" ] ); then +if [ -n "$STRAP_GITHUB_USER" ] && ( [ ! -f "$HOME/.Brewfile" ] || [ "$HOME/.Brewfile" -ef "$HOME/.homebrew-brewfile/Brewfile" ] ); then HOMEBREW_BREWFILE_URL="https://github.com/$STRAP_GITHUB_USER/homebrew-brewfile" if git ls-remote "$HOMEBREW_BREWFILE_URL" &>/dev/null; then