Commitd53115c

committed

unlink and reinstall

1 parent21be118 commitd53115cCopy full SHA for d53115c

File tree

+10

-8

lines changed

+10

-8

lines changed

Lines changed: 10 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -101,14 +101,6 @@ function pre_build {`
`101`	`101`	`brew_add_local_bottles`
`102`	`102`	`fi`
`103`	`103`
`104`		`-echo'Installing qt5'`
`105`		`-if [-n"$CACHE_STAGE" ];then`
`106`		`-echo"Qt5 has bottle, no caching needed"`
`107`		`-else`
`108`		`- brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/079ce55db79acc87b91bec950249595b1584e119/Formula/qt.rb`
`109`		`-export PATH="/usr/local/opt/qt/bin:$PATH"`
`110`		`-fi`
`111`		`-`
`112`	`104`	`echo'Installing FFmpeg'`
`113`	`105`
`114`	`106`	`if [-n"$CACHE_STAGE" ];then`
`@@ -118,6 +110,16 @@ function pre_build {`
`118`	`110`	`brew install ffmpeg_opencv`
`119`	`111`	`fi`
`120`	`112`
	`113`	`+echo'Installing qt5'`
	`114`	`+`
	`115`	`+if [-n"$CACHE_STAGE" ];then`
	`116`	`+echo"Qt5 has bottle, no caching needed"`
	`117`	`+else`
	`118`	`+ brew unlink qt`
	`119`	`+ brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/079ce55db79acc87b91bec950249595b1584e119/Formula/qt.rb`
	`120`	`+export PATH="/usr/local/opt/qt/bin:$PATH"`
	`121`	`+fi`
	`122`	`+`
`121`	`123`	`if [-n"$CACHE_STAGE" ];then`
`122`	`124`	`brew_go_bootstrap_mode 0`
`123`	`125`	`return 0`

Comments

(0)