Merge branch 'nd/diff-flush-before-warning' into maint

diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index 067e6eb702865024cf3d54d16c66019bcd930cd5..75a9fd2475168fce9e229ce44db2808227700e17 100755 (executable)
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -5,33 +5,32 @@
 
 . ${0%/*}/lib-travisci.sh
 
-case "${TRAVIS_OS_NAME:-linux}" in
-       linux)
-               export GIT_TEST_HTTPD=YesPlease
+P4WHENCE=http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION
+LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION
 
-               mkdir --parents custom/p4
-               pushd custom/p4
-                       wget --quiet http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION/bin.linux26x86_64/p4d
-                       wget --quiet http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION/bin.linux26x86_64/p4
-                       chmod u+x p4d
-                       chmod u+x p4
-                       export PATH="$(pwd):$PATH"
-               popd
-               mkdir --parents custom/git-lfs
-               pushd custom/git-lfs
-                       wget --quiet https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION/git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz
-                       tar --extract --gunzip --file "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz"
-                       cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs .
-                       export PATH="$(pwd):$PATH"
-               popd
+case "$jobname" in
+linux-clang|linux-gcc)
+       mkdir --parents "$P4_PATH"
+       pushd "$P4_PATH"
+               wget --quiet "$P4WHENCE/bin.linux26x86_64/p4d"
+               wget --quiet "$P4WHENCE/bin.linux26x86_64/p4"
+               chmod u+x p4d
+               chmod u+x p4
+       popd
+       mkdir --parents "$GIT_LFS_PATH"
+       pushd "$GIT_LFS_PATH"
+               wget --quiet "$LFSWHENCE/git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz"
+               tar --extract --gunzip --file "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz"
+               cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs .
+       popd
        ;;
-       osx)
-               brew update --quiet
-               # Uncomment this if you want to run perf tests:
-               # brew install gnu-time
-               brew install git-lfs gettext
-               brew link --force gettext
-               brew install caskroom/cask/perforce
+osx-clang|osx-gcc)
+       brew update --quiet
+       # Uncomment this if you want to run perf tests:
+       # brew install gnu-time
+       brew install git-lfs gettext
+       brew link --force gettext
+       brew install caskroom/cask/perforce
        ;;
 esac