diff --git a/.travis.yml b/.travis.yml index 2a7b632..d39dc8f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,8 @@ before_script: - sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu trusty main" - sudo apt-get update -qq - sudo apt-get install -qq wget python2.7 -# - wget https://raw.githubusercontent.com/thejockel/BOSWatch/develop/install.sh - - wget https://raw.githubusercontent.com/Schrolli91/BOSWatch/master/install.sh + - wget https://raw.githubusercontent.com/thejockel/BOSWatch/develop/install.sh +# - wget https://raw.githubusercontent.com/Schrolli91/BOSWatch/master/install.sh - chmod +x install.sh - cat /etc/os-release - echo ${TRAVIS_BRANCH} diff --git a/citest/test.sh b/citest/test.sh index 5dc310f..2e3d21e 100644 --- a/citest/test.sh +++ b/citest/test.sh @@ -7,7 +7,6 @@ echo $module if [ $module == "base" ]; then cp $bospath/config/config.template.ini $bospath/config/config.ini sudo /usr/bin/python $bospath/boswatch.py -f 1 -d 0 -e 10 -a POC512 POC1200 POC2400 -v -t - boserror=$(sudo cat $bospath/log/boswatch.log | grep -i ERROR) sudo chmod 777 $bospath/log/boswatch.log if grep -Fxq '\[ERROR' "$bospath/log/boswatch.log" @@ -27,7 +26,8 @@ elif [ $module == "mysql" ]; then sudo service mysql start sudo mysql -e "create database boswatch;" - sudo mysql boswatch < plugins/MySQL/boswatch.sql + sudo mysql -e "\. plugins/MySQL/boswatch.sql" + #sudo mysql boswatch < plugins/MySQL/boswatch.sql sudo /usr/bin/python $bospath/boswatch.py -f 1 -d 0 -e 10 -a POC512 POC1200 POC2400 -v -t sudo chmod 777 $bospath/log/boswatch.log diff --git a/install.sh b/install.sh index 1dfc5e4..cc57562 100644 --- a/install.sh +++ b/install.sh @@ -166,7 +166,8 @@ echo "-> download BOSWatch..................." cd $boswatchpath/ case $branch in - "dev") git clone -b develop https://github.com/Schrolli91/BOSWatch >> $boswatchpath/install/setup_log.txt 2>&1 && \ +# "dev") git clone -b develop https://github.com/Schrolli91/BOSWatch >> $boswatchpath/install/setup_log.txt 2>&1 && \ + "dev") git clone -b develop https://github.com/thejockel/BOSWatch >> $boswatchpath/install/setup_log.txt 2>&1 && \ exitcodefunction $? git-clone BOSWatch-develop ;; *) git clone -b master https://github.com/Schrolli91/BOSWatch >> $boswatchpath/install/setup_log.txt 2>&1 && \ exitcodefunction $? git-clone BOSWatch ;;