chg: travis ci again

diff --git a/.travis.yml b/.travis.yml
index a81e7eb819c975eadbe2f3f38bc251666a67e7f6..c5de4790ed2100b5d3e81b37d810a56c2ff4fcae 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,22 +20,22 @@ matrix:
     - os: osx
 
 # MAC OS - dependencies?
     - os: osx
 
 # MAC OS - dependencies?

-before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew tap iceman1001/proxmark3; fi
+#before_install:
+#  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
+#  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew tap iceman1001/proxmark3; fi

 
 ## Install mainline ARM toolchain.  gcc-arm-none-eabi is available
 ## in Ubuntu >= 14.04, but this external PPA is needed for 12.04.
 before_script:
   if  [[ "$TRAVIS_OS_NAME" == "linux" ]]; then 
 
 ## Install mainline ARM toolchain.  gcc-arm-none-eabi is available
 ## in Ubuntu >= 14.04, but this external PPA is needed for 12.04.
 before_script:
   if  [[ "$TRAVIS_OS_NAME" == "linux" ]]; then 

-  - sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu trusty main universe multiverse restricted';
-  - sudo apt-get update -qq;
-  - sudo apt-get install -y gcc-arm-none-eabi;
-  - git fetch --all
+  sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu trusty main universe multiverse restricted';
+  sudo apt-get update -qq;
+  sudo apt-get install -y gcc-arm-none-eabi;
+  git fetch --all

   elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then 
   elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then 

-  - brew update;
-  - brew tap iceman1001/proxmark3;
-  - brew install proxmark3;
+  brew update;
+  brew tap iceman1001/proxmark3;
+  brew install proxmark3;

   fi
 #make command
 script: "make all"
\ No newline at end of file
   fi
 #make command
 script: "make all"
\ No newline at end of file