Adjust PATH in .travis.yml instead of travis.sh.

.travis.yml

@@ -2,7 +2,9 @@ language: cpp
 compiler:
   - gcc
   - clang
-install: ./travis.sh install
+install:
+  - ./travis.sh install
+  - export PATH=$PATH:$PWD/protoc  # used by genfiles_install()
 script: ./travis.sh script
 after_success: ./travis.sh after_success
 after_failure: ./travis.sh after_failure

travis.sh

@@ -75,15 +75,16 @@ genfiles_install() {
   sudo apt-get install lua5.2 liblua5.2-dev
 
   # Need a recent version of protoc to compile proto3 files.
+  # .travis.yml will add this to our path
   mkdir protoc
   cd protoc
   wget https://github.com/google/protobuf/releases/download/v3.0.0-beta-2/protoc-3.0.0-beta-2-linux-x86_64.zip
   unzip protoc-3.0.0-beta-2-linux-x86_64.zip
-  export PATH=`pwd`:$PATH
   cd ..
-  protoc --version || true
 }
 genfiles_script() {
+  protoc --version || true
+
   # Avoid regenerating descriptor.pb, since its output can vary based on the
   # version of protoc.
   touch upb/descriptor/descriptor.pb