You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by le...@apache.org on 2015/12/29 23:35:25 UTC
[1/2] climate git commit: Resolve CLIMATE-561 : wraping up the error
in install-ubuntu.sh
Repository: climate
Updated Branches:
refs/heads/master 0630c5083 -> 92ae043c4
Resolve CLIMATE-561 : wraping up the error in install-ubuntu.sh
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/93f6bf32
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/93f6bf32
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/93f6bf32
Branch: refs/heads/master
Commit: 93f6bf32eb65c21fcd8005ac33a775bb03272f05
Parents: 0630c50
Author: Omkar20895 <om...@Omkars-MacBook-Pro.local>
Authored: Sun Dec 20 15:40:39 2015 +0530
Committer: Omkar20895 <om...@Omkars-MacBook-Pro.local>
Committed: Sun Dec 20 15:40:39 2015 +0530
----------------------------------------------------------------------
easy-ocw/install-ubuntu.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/93f6bf32/easy-ocw/install-ubuntu.sh
----------------------------------------------------------------------
diff --git a/easy-ocw/install-ubuntu.sh b/easy-ocw/install-ubuntu.sh
index f0f6ec5..ac72264 100755
--- a/easy-ocw/install-ubuntu.sh
+++ b/easy-ocw/install-ubuntu.sh
@@ -96,17 +96,17 @@ ENDINTRO
if [ $WITH_VIRTUAL_ENV != 1 ]; then
cat << VIRTUALENV_WARNING
-$(tput setaf 1)<-----------------------------[WARNING!]----------------------------------->
+$(tput setaf 1)<-----------------------------[WARNING!]----------------------------------->$(tput sgr 0)
It is highly recommended that you allow Easy OCW to install the dependencies
into a virtualenv environment to ensure that your global Python install is
not affected. If you're UNSURE, you should pass the -e flag
to this script. If you aren't concerned, or you want to create your own
-virtualenv environment, then feel free to ignore this message.$(tput setaf 0)
+virtualenv environment, then feel free to ignore this message.
VIRTUALENV_WARNING
fi
-read -p "Press [Yy] to begin installation with the flag -e $(tput setaf 2)[RECOMMENDED]$(tput setaf 0)
+read -p "Press [Yy] to begin installation with the flag -e $(tput setaf 2)[RECOMMENDED]$(tput sgr 0)
[OR]
Press [Nn] to continue with the normal installation..." yn
case $yn in
[2/2] climate git commit: Resolve CLIMATE-560 : Does not assume
installation directory within easy-ocw/install-osx.sh
Posted by le...@apache.org.
Resolve CLIMATE-560 : Does not assume installation directory within easy-ocw/install-osx.sh
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/92ae043c
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/92ae043c
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/92ae043c
Branch: refs/heads/master
Commit: 92ae043c4f87c8f7b7356e380f22d07e08b8ba02
Parents: 93f6bf3
Author: Omkar20895 <om...@Omkars-MacBook-Pro.local>
Authored: Sun Dec 20 20:50:48 2015 +0530
Committer: Omkar20895 <om...@Omkars-MacBook-Pro.local>
Committed: Sun Dec 20 20:50:48 2015 +0530
----------------------------------------------------------------------
easy-ocw/install-osx.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/92ae043c/easy-ocw/install-osx.sh
----------------------------------------------------------------------
diff --git a/easy-ocw/install-osx.sh b/easy-ocw/install-osx.sh
index cace463..aeaeae6 100755
--- a/easy-ocw/install-osx.sh
+++ b/easy-ocw/install-osx.sh
@@ -213,7 +213,7 @@ alias below.
To make it easier to change into the 'ocw' virtualenv add the
following alias to your ~/.bash_profile
- alias ocw='source $ocw_path/ocw/bin/activate ~/ocw/'
+ alias ocw='source $ocw_path/ocw/bin/activate $ocw_path/ocw/'
When you want to use ocw in the future, you just have to type 'ocw'
in your terminal."