use ggrep on mac instead of bsd grep
This commit is contained in:
@@ -11,7 +11,7 @@ wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
|
||||
|
||||
# Check if there's been a new commit since this build, and if so don't upload it
|
||||
|
||||
REMOTE=$(curl -s -N https://api.github.com/repos/olive-editor/olive/commits/master | grep -Po '(?<=: \")(([a-z0-9])\w+)(?=\")' -m 1)
|
||||
REMOTE=$(curl -s -N https://api.github.com/repos/olive-editor/olive/commits/master | $GREP -Po '(?<=: \")(([a-z0-9])\w+)(?=\")' -m 1)
|
||||
LOCAL=$(git rev-parse HEAD)
|
||||
|
||||
if [ "$REMOTE" == "$LOCAL" ]
|
||||
|
||||
+4
-1
@@ -2,11 +2,14 @@
|
||||
|
||||
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
||||
|
||||
brew install ffmpeg qt5 python@2
|
||||
brew install ffmpeg qt5 python@2 grep
|
||||
export GREP=ggrep
|
||||
export PATH="/usr/local/opt/qt/bin:/usr/local/opt/python@2/libexec/bin:$PATH"
|
||||
|
||||
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
||||
|
||||
export GREP=grep
|
||||
|
||||
if [ "$ARCH" == "x86_64" ]; then
|
||||
sudo apt-get -y install qt59base qt59multimedia qt59svg libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev frei0r-plugins-dev frei0r-plugins fuse
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user