climate-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject [1/2] climate git commit: CLIMATE-711 - Resolve bashrc sourcing issue in conda-install
Date Fri, 20 Nov 2015 22:13:18 GMT
Repository: climate
Updated Branches:
  refs/heads/master 5b1ea0a44 -> a9c8ef40f


CLIMATE-711 - Resolve bashrc sourcing issue in conda-install

- The conda-install.sh Easy-OCW script now sets PS1 prior to attempting
  to source bashrc to ensure that conda is locatable after install.
- The post-miniconda bashrc source has been moved out the miniconda
  install block.


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/d57b4ad1
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/d57b4ad1
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/d57b4ad1

Branch: refs/heads/master
Commit: d57b4ad15bda955596151f54a387fcaaa5ee3f20
Parents: 5b1ea0a
Author: Michael Joyce <joyce@apache.org>
Authored: Fri Nov 20 14:07:28 2015 -0800
Committer: Michael Joyce <joyce@apache.org>
Committed: Fri Nov 20 14:07:28 2015 -0800

----------------------------------------------------------------------
 easy-ocw/conda-install.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/climate/blob/d57b4ad1/easy-ocw/conda-install.sh
----------------------------------------------------------------------
diff --git a/easy-ocw/conda-install.sh b/easy-ocw/conda-install.sh
index 0d07e68..211f761 100755
--- a/easy-ocw/conda-install.sh
+++ b/easy-ocw/conda-install.sh
@@ -36,9 +36,10 @@ command -v conda >/dev/null 2>&1 || {
         echo "Unable to identify your OS. Please report this to the OCW List"
         echo "dev@climate.apache.org"
     fi
-
-    source ~/.bashrc
 }
 
+PS1='$ '
+source ~/.bashrc
+
 echo "Creating conda environment from ocw environment file"
 conda env create -f conda_environment.txt


Mime
View raw message