Merge pull request #1470 from emanueldima/master

Switch to master branch in docs and scripts

INSTALL.rst

@@ -229,8 +229,8 @@ files:
 
     $ mdir develop-b2share
     $ cd develop-b2share
-    $ curl -O https://raw.githubusercontent.com/EUDAT-B2SHARE/b2share/evolution/devenv/docker-compose.yml
-    $ curl -O https://raw.githubusercontent.com/EUDAT-B2SHARE/b2share/evolution/devenv/run_demo.sh
+    $ curl -O https://raw.githubusercontent.com/EUDAT-B2SHARE/b2share/master/devenv/docker-compose.yml
+    $ curl -O https://raw.githubusercontent.com/EUDAT-B2SHARE/b2share/master/devenv/run_demo.sh
 
 
 Then start the ``run_demo.sh`` script:
@@ -240,7 +240,7 @@ Then start the ``run_demo.sh`` script:
     $ chmod +x ./run_demo.sh
     $ ./run_demo.sh
 
-The script will create a python virtualenv, clone the evolution branch of
+The script will create a python virtualenv, clone the master branch of
 B2SHARE into it, install the necessary python packages, build the web UI and
 start the Flask server in development mode. B2SHARE should be available at
 http://localhost:5000.

README.rst

@@ -24,8 +24,8 @@ B2SHARE
 .. image:: https://img.shields.io/travis/EUDAT-B2SHARE/b2share.svg
         :target: https://travis-ci.org/EUDAT-B2SHARE/b2share
 
-.. image:: https://coveralls.io/repos/github/EUDAT-B2SHARE/b2share/badge.svg?branch=evolution
-        :target: https://coveralls.io/github/EUDAT-B2SHARE/b2share?branch=evolution
+.. image:: https://coveralls.io/repos/github/EUDAT-B2SHARE/b2share/badge.svg?branch=master
+        :target: https://coveralls.io/github/EUDAT-B2SHARE/b2share?branch=master
 
 .. image:: https://img.shields.io/github/tag/EUDAT-B2SHARE/b2share.svg
         :target: https://github.com/EUDAT-B2SHARE/b2share/releases

devenv/run_demo.sh

@@ -21,7 +21,7 @@ fi
 
 source /usr/local/bin/virtualenvwrapper.sh
 
-export VIRTUALENV_NAME='b2share-evolution'
+export VIRTUALENV_NAME='b2share'
 export DB_NAME='b2share-evolution'
 
 if [ "$1" = "--reinit" ]; then
@@ -61,7 +61,7 @@ export B2SHARE_SEARCH_ELASTIC_HOSTS="${DOCKER_IP}:9200"
 cdvirtualenv src
 if [ ! -d ./b2share ]; then
 	echo; echo "### Clone b2share"
-	git clone [email protected]:EUDAT-B2SHARE/b2share.git --branch evolution
+	git clone [email protected]:EUDAT-B2SHARE/b2share.git
 
 	echo; echo "### pip install b2share"
 	cdvirtualenv src/b2share