diff --git a/.travis.yml b/.travis.yml index d39dc8f..2a7b632 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/README.md b/README.md index 3a69ada..fb9e541 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ |branch|quality|CI-Build| |---|---|---| -|master-branch|[![Codacy Badge](https://img.shields.io/codacy/grade/d512976554354a199555bd34ed179bb1/master.svg)](https://www.codacy.com/app/Schrolli91/BOSWatch/dashboard?bid=3763821)|[![Build Status](https://travis-ci.org/thejockel/BOSWatch.svg?branch=master)](https://travis-ci.org/thejockel/BOSWatch)| -|develop-branch|[![Codacy Badge](https://img.shields.io/codacy/grade/d512976554354a199555bd34ed179bb1/develop.svg)](https://www.codacy.com/app/Schrolli91/BOSWatch/dashboard?bid=3763820)|[![Build Status](https://travis-ci.org/thejockel/BOSWatch.svg?branch=develop)](https://travis-ci.org/thejockel/BOSWatch)| +|master-branch|[![Codacy Badge](https://img.shields.io/codacy/grade/d512976554354a199555bd34ed179bb1/master.svg)](https://www.codacy.com/app/Schrolli91/BOSWatch/dashboard?bid=3763821)|[![Build Status](https://travis-ci.org/Schrolli91/BOSWatch.svg?branch=master)](https://travis-ci.org/thejockel/BOSWatch)| +|develop-branch|[![Codacy Badge](https://img.shields.io/codacy/grade/d512976554354a199555bd34ed179bb1/develop.svg)](https://www.codacy.com/app/Schrolli91/BOSWatch/dashboard?bid=3763820)|[![Build Status](https://travis-ci.org/Schrolli91/BOSWatch.svg?branch=develop)](https://travis-ci.org/thejockel/BOSWatch)| **Achtung:** Die readme ist veraltet - Neue Informationen werden im Laufe der Zeit in das Github Wiki integriert! diff --git a/install.sh b/install.sh index 95338fc..1dfc5e4 100644 --- a/install.sh +++ b/install.sh @@ -166,12 +166,9 @@ 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 && \ -# exitcodefunction $? git-clone BOSWatch-develop ;; - "dev") git clone -b develop https://github.com/thejockel/BOSWatch >> $boswatchpath/install/setup_log.txt 2>&1 && \ - exitcodefunction $? git-clone BOSWatch-develop-jockel ;; + "dev") git clone -b develop https://github.com/Schrolli91/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 && \ -# *) git clone -b develop https://github.com/thejockel/BOSWatch >> $boswatchpath/install/setup_log.txt 2>&1 && \ exitcodefunction $? git-clone BOSWatch ;; esac