From a92cbab0bc3e1072f31d8e14965814aa722851ea Mon Sep 17 00:00:00 2001
From: Pierre LALET <pierre.lalet@cea.fr>
Date: Tue, 5 Dec 2017 10:07:26 +0100
Subject: [PATCH] Travis: use regular OSX image

---
 .travis.yml        | 6 +-----
 .travis/install.sh | 2 ++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dab0f88cf..7d91ebe67 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,13 +33,11 @@ matrix:
 
         - os: osx
           language: generic
-          osx_image: xcode7.3
 
         - os: osx
           language: generic
-          osx_image: xcode7.3
           env:
-            - SCAPY_SUDO=false SCAPY_USE_PCAPDNET=yes
+            - SCAPY_USE_PCAPDNET=yes
 
         # Run as root
         - os: linux
@@ -106,13 +104,11 @@ matrix:
 
         - os: osx
           language: generic
-          osx_image: xcode7.3
           env:
             - SCAPY_SUDO=sudo SCAPY_COVERAGE=yes
 
         - os: osx
           language: generic
-          osx_image: xcode7.3
           env:
             - SCAPY_SUDO=sudo SCAPY_USE_PCAPDNET=yes SCAPY_COVERAGE=yes
 
diff --git a/.travis/install.sh b/.travis/install.sh
index 11ee4d038..10bfa31b4 100644
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -1,3 +1,5 @@
+PIP=`which pip || (python --version | grep -q 'Python 2' && which pip2) || (python --version | grep -q 'Python 3' && which pip3)`
+
 # Install dependencies using pip
 if [ -z "$SCAPY_SUDO" -o "$SCAPY_SUDO" = "false" ]
 then