X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/44c433762f7829658eabe3f31d46ad8c2db195b5..abf3b8af8e535ba962299b547e9b1a045442d726:/.travis.yml?ds=inline

diff --git a/.travis.yml b/.travis.yml
index 665b6fd1..ea0a545c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-# Travis-CI Build for Iceman Fork / Proxmark3
+# Travis-CI Build for IcemanFork/Proxmark3
 language: c
 
 #default linux build env is: Ubuntu 14.04 trusty
@@ -19,19 +19,20 @@ matrix:
   allow_failures:
     - os: osx
 
-# MAC OS - dependencies?
-before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update          ; fi
-
+#before_install:
+  
+  
 ## 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" ]]; 
-   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;
-   fi
-   - git fetch --all
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu trusty main universe multiverse restricted'; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y gcc-arm-none-eabi; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git fetch --all; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install perl; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew tap iceman1001/proxmark3; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install proxmark3; fi
 
-#make command
+  #make command
 script: "make all"
\ No newline at end of file