travis-ci: ask homebrew for its path instead of hardcoding it

larsxschneider · gitster · commit f86f49bee9ba · 2016-09-22T10:23:01.000-07:00
The TravisCI macOS build is broken because homebrew (a macOS dependency manager) changed its internal directory structure [1]. This is a problem because we modify the Perforce dependencies in the homebrew repository before installing them. Fix it by asking homebrew for its path instead of hardcoding it. [1] Homebrew/brew@0a09ae3 Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/.travis.yml b/.travis.yml
@@ -51,7 +51,7 @@ before_install:
         FORMULA=$1
         SHA=$(brew fetch --force $FORMULA 2>&1 | grep ^SHA256: | cut -d ' ' -f 2)
         sed -E -i.bak "s/sha256 \"[0-9a-f]{64}\"/sha256 \"$SHA\"/g" \
-          /usr/local/Library/Taps/homebrew/homebrew-binary/$FORMULA.rb
+          "$(brew --repository homebrew/homebrew-binary)/$FORMULA.rb"
       }
       brew update --quiet
       brew tap homebrew/binary --quiet

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ before_install:`
`51`	`51`	`FORMULA=$1`
`52`	`52`	`SHA=$(brew fetch --force $FORMULA 2>&1 \| grep ^SHA256: \| cut -d ' ' -f 2)`
`53`	`53`	`sed -E -i.bak "s/sha256 \"[0-9a-f]{64}\"/sha256 \"$SHA\"/g" \`
`54`		`- /usr/local/Library/Taps/homebrew/homebrew-binary/$FORMULA.rb`
	`54`	`+ "$(brew --repository homebrew/homebrew-binary)/$FORMULA.rb"`
`55`	`55`	`}`
`56`	`56`	`brew update --quiet`
`57`	`57`	`brew tap homebrew/binary --quiet`