Merge branch 'master' of github.com:cgat-developers/cgat-flow

cgat-developers · May 24, 2018 · ed5180a · ed5180a
2 parents 499f2fe + 57a7609
commit ed5180a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/README.rst b/README.rst
@@ -35,7 +35,7 @@ free to give it a go::
 
         # once the installation is finished, enable the conda environment as requested by the installation script
         # NB: you probably want to automate this by adding the instructions below to your .bashrc
-        source </full/path/to/folder/without/trailing/slash>/conda-install/etc/profile.d/conda.sh cgat-f
+        source </full/path/to/folder/without/trailing/slash>/conda-install/etc/profile.d/conda.sh
         conda activate base
         conda activate cgat-f
 

diff --git a/doc/InstallingPipelines.rst b/doc/InstallingPipelines.rst
@@ -42,7 +42,7 @@ Here are the steps::
 
         # once the installation is finished, enable the conda environment as requested by the installation script:
         # NB: you probably want to automate this by adding the instructions below to your .bashrc
-        source </full/path/to/folder/without/trailing/slash>/conda-install/etc/profile.d/conda.sh cgat-f
+        source </full/path/to/folder/without/trailing/slash>/conda-install/etc/profile.d/conda.sh
         conda activate base
         conda activate cgat-f
 

diff --git a/install-CGAT-tools.sh b/install-CGAT-tools.sh
@@ -396,7 +396,7 @@ if [[ -z ${TRAVIS_INSTALL} ]] ; then
       echo " The code successfully installed!"
       echo
       echo " To activate the CGAT environment type: "
-      echo " $ source $CONDA_INSTALL_DIR/etc/profile.d/conda.sh $CONDA_INSTALL_ENV"
+      echo " $ source $CONDA_INSTALL_DIR/etc/profile.d/conda.sh"
       echo " $ conda activate base"
       echo " $ conda activate $CONDA_INSTALL_ENV"
       [[ $INSTALL_PRODUCTION ]] && echo " cgatflow --help"