From 8c1bb0cab2b0ab7b93febbd9e7c7075ddf41ffb9 Mon Sep 17 00:00:00 2001 From: John Jarvis Date: Wed, 1 Aug 2012 10:54:32 -0400 Subject: [PATCH 1/3] sanity checking /usr/local, updating coffee script install location, old location no longer works --- create-dev-env.sh | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/create-dev-env.sh b/create-dev-env.sh index 7ebff77fb2..d0d5c30faa 100755 --- a/create-dev-env.sh +++ b/create-dev-env.sh @@ -203,6 +203,24 @@ case `uname -s` in esac ;; Darwin) + + if [[ ! -w /usr/local ]]; then + cat</dev/null || { output "Installing brew" /usr/bin/ruby -e "$(curl -fsSL https://raw.github.com/mxcl/homebrew/master/Library/Contributions/install_homebrew.rb)" @@ -238,7 +256,7 @@ case `uname -s` in command -v coffee &>/dev/null || { output "Installing coffee script" - curl http://npmjs.org/install.sh | sh + curl --insecure https://npmjs.org/install.sh | sh npm install -g coffee-script } ;; From 71898e4869df7f88249c7b7da71e4fa851035606 Mon Sep 17 00:00:00 2001 From: John Jarvis Date: Wed, 1 Aug 2012 10:54:50 -0400 Subject: [PATCH 2/3] removing matplotlib from requirements.txt --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 978b5e6f1a..4cc132d6ff 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,6 @@ django<1.4 pip numpy scipy -matplotlib markdown pygments lxml From 94c19059b58a443ad6bdd9ada47fe6d6e74d7abb Mon Sep 17 00:00:00 2001 From: John Jarvis Date: Wed, 1 Aug 2012 11:08:41 -0400 Subject: [PATCH 3/3] trailing whitespace --- create-dev-env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/create-dev-env.sh b/create-dev-env.sh index d0d5c30faa..8a1a7e6f89 100755 --- a/create-dev-env.sh +++ b/create-dev-env.sh @@ -215,7 +215,7 @@ case `uname -s` in and re-run the script: $ sudo chown -R $USER /usr/local -EO +EO exit 1