From 7ca8863a8c20c27981853863b0ff28a7b0442733 Mon Sep 17 00:00:00 2001
From: "Fabio C. Barrionuevo da Luz" <bnafta@gmail.com>
Date: Sun, 30 Aug 2015 22:56:19 -0300
Subject: [PATCH] Small improvements in install_python_dependencies.sh and
 install_os_dependencies.sh scripts

---
 {{cookiecutter.repo_name}}/install_os_dependencies.sh     | 2 +-
 {{cookiecutter.repo_name}}/install_python_dependencies.sh | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/{{cookiecutter.repo_name}}/install_os_dependencies.sh b/{{cookiecutter.repo_name}}/install_os_dependencies.sh
index 477dcafd..aea9dec4 100755
--- a/{{cookiecutter.repo_name}}/install_os_dependencies.sh
+++ b/{{cookiecutter.repo_name}}/install_os_dependencies.sh
@@ -24,7 +24,7 @@ function usage_message()
 
 # Read the requirements.apt file, and remove comments and blank lines
 function list_packages(){
-     cat ${OS_REQUIREMENTS_FILENAME} | grep -v "#" | grep -v "^$";
+     grep -v "#" ${OS_REQUIREMENTS_FILENAME} | grep -v "^$";
 }
 
 function install()
diff --git a/{{cookiecutter.repo_name}}/install_python_dependencies.sh b/{{cookiecutter.repo_name}}/install_python_dependencies.sh
index 0de90c82..34929e60 100755
--- a/{{cookiecutter.repo_name}}/install_python_dependencies.sh
+++ b/{{cookiecutter.repo_name}}/install_python_dependencies.sh
@@ -3,7 +3,7 @@
 pip --version >/dev/null 2>&1 || {
     echo >&2 -e "\npip is required but it's not installed."
     echo >&2 -e "You can install it by running the following command:\n"
-    echo >&2 "wget https://bootstrap.pypa.io/get-pip.py; chmod +x get-pip.py; sudo ./get-pip.py"
+    echo >&2 "wget https://bootstrap.pypa.io/get-pip.py --output-document=get-pip.py; chmod +x get-pip.py; sudo -H python3 get-pip.py"
     echo >&2 -e "\n"
     echo >&2 -e "\nFor more information, see pip documentation: https://pip.pypa.io/en/latest/"
     exit 1;
@@ -12,7 +12,7 @@ pip --version >/dev/null 2>&1 || {
 virtualenv --version >/dev/null 2>&1 || {
     echo >&2 -e "\nvirtualenv is required but it's not installed."
     echo >&2 -e "You can install it by running the following command:\n"
-    echo >&2 "sudo pip install virtualenv"
+    echo >&2 "sudo -H pip3 install virtualenv"
     echo >&2 -e "\n"
     echo >&2 -e "\nFor more information, see virtualenv documentation: https://virtualenv.pypa.io/en/latest/"
     exit 1;
@@ -21,7 +21,7 @@ virtualenv --version >/dev/null 2>&1 || {
 if [ -z "$VIRTUAL_ENV" ]; then
     echo >&2 -e "\nYou need activate a virtualenv first"
     echo >&2 -e 'If you do not have a virtualenv created, run the following command to create and automatically activate a new virtualenv named "venv" on current folder:\n'
-    echo >&2 -e "virtualenv venv"
+    echo >&2 -e "virtualenv venv --python=\`which python3\`"
     echo >&2 -e "\nTo leave/disable the currently active virtualenv, run the following command:\n"
     echo >&2  "deactivate"
     echo >&2 -e "\nTo activate the virtualenv again, run the following command:\n"