From 4aeb7467dea83f7c459d9f29d4d08a1a560b4548 Mon Sep 17 00:00:00 2001
From: Carlos H <chgusy@gmail.com>
Date: Mon, 3 Nov 2014 18:24:53 +0000
Subject: [PATCH 1/2] fix for scikit-learn install

---
 bin/compile | 22 ++++++++++++----------
 bin/utils   |  1 +
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/bin/compile b/bin/compile
index 365365f00..4f1b8199f 100755
--- a/bin/compile
+++ b/bin/compile
@@ -178,16 +178,6 @@ sub-env $BIN_DIR/steps/collectstatic
 # ### Finalize
 #
 
-# Set context environment variables.
-set-env PATH '$HOME/.heroku/python/bin:$PATH'
-set-env PYTHONUNBUFFERED true
-set-env PYTHONHOME /app/.heroku/python
-set-env LIBRARY_PATH /app/.heroku/vendor/lib:/app/.heroku/python/lib
-set-env LD_LIBRARY_PATH '/app/.heroku/vendor/lib:/app/.heroku/python/lib:$LD_LIBRARY_PATH'
-set-default-env LANG en_US.UTF-8
-set-default-env PYTHONHASHSEED random
-set-default-env PYTHONPATH /app/
-
 
 # Experimental post_compile hook.
 bpwatch start post_compile
@@ -214,3 +204,15 @@ bpwatch start anvil_appdir_commit
 
 bpwatch stop anvil_appdir_commit
 bpwatch stop compile
+
+# Set context environment variables.
+set-env PATH '$HOME/.heroku/python/bin:$PATH'
+set-env PYTHONUNBUFFERED true
+set-env PYTHONHOME /app/.heroku/python
+set-env LIBRARY_PATH /app/.heroku/vendor/lib:/app/.heroku/python/lib
+set-env LD_LIBRARY_PATH '/app/.heroku/vendor/lib:/app/.heroku/python/lib:$LD_LIBRARY_PATH'
+set-default-env LANG en_US.UTF-8
+set-default-env PYTHONHASHSEED random
+set-default-env PYTHONPATH /app/
+
+
diff --git a/bin/utils b/bin/utils
index a57d54e74..5b81ac2ac 100755
--- a/bin/utils
+++ b/bin/utils
@@ -28,6 +28,7 @@ puts-warn() {
 
 # Usage: $ set-env key value
 set-env() {
+  export "$1=$(eval echo $2)
   echo "export $1=$2" >> $PROFILE_PATH
 }
 

From 42ffeb03604cc9807e38465f47bfbdfb54209cbd Mon Sep 17 00:00:00 2001
From: Carlos H <chgusy@gmail.com>
Date: Tue, 4 Nov 2014 08:29:27 +0000
Subject: [PATCH 2/2] typo

---
 bin/utils | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/utils b/bin/utils
index 5b81ac2ac..0e740b0b8 100755
--- a/bin/utils
+++ b/bin/utils
@@ -28,7 +28,7 @@ puts-warn() {
 
 # Usage: $ set-env key value
 set-env() {
-  export "$1=$(eval echo $2)
+  export "$1=$(eval echo $2)"
   echo "export $1=$2" >> $PROFILE_PATH
 }