diff --git a/.travis.yml b/.travis.yml index 88538d7..13f90ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,10 +19,12 @@ matrix: - MATRIX_EVAL="brew install gcc && CC=gcc-6 && CXX=g++-6" before_install: - - sudo apt-get update - eval "${MATRIX_EVAL}" -install: ./install.sh -script: ant test -after_script: ./uninstall.sh +install: + - ./install.sh +script: + - ant test +after_script: + - ./uninstall.sh after_success: - bash <(curl -s https://codecov.io/bash) diff --git a/install.sh b/install.sh index 3c1b205..11ce3c4 100755 --- a/install.sh +++ b/install.sh @@ -1,5 +1,9 @@ -sudo apt-get update -sudo apt-get install libjsoncpp-dev +if [ $kernel == "Darwin" ]; then + brew install jsoncpp +else + sudo apt-get update + sudo apt-get install libjsoncpp-dev + cp lib/anttasks.jar ~ pushd ~ jar xf anttasks.jar diff --git a/mac_install.sh b/mac_install.sh deleted file mode 100755 index 0c32d3e..0000000 --- a/mac_install.sh +++ /dev/null @@ -1,5 +0,0 @@ -brew install jsoncpp -cp lib/anttasks.jar ~ -pushd ~ -jar xf anttasks.jar -pushd -0 diff --git a/mac_uninstall.sh b/mac_uninstall.sh deleted file mode 100755 index 117094b..0000000 --- a/mac_uninstall.sh +++ /dev/null @@ -1,6 +0,0 @@ -brew uninstall jsoncpp -cd ../ -echo "Deleting project files" -rm -rf TicketingSystem -echo "Removing additional installed library" -rm -rf ~/anttasks.jar diff --git a/uninstall.sh b/uninstall.sh index 27d720b..02eddd0 100755 --- a/uninstall.sh +++ b/uninstall.sh @@ -1,4 +1,7 @@ -sudo apt-get remove --purge libjsoncpp-dev +if [ $kernel == "Darwin" ]; then + sudo apt-get remove --purge libjsoncpp-dev +else + brew uninstall jsoncpp cd ../ echo "Deleting project files" rm -rf TicketingSystem