From 227d5c8b20ac85831a06beb6486e2e81a34b9bd2 Mon Sep 17 00:00:00 2001
From: Suraj Ravichandran <sravichandran@talisbio.com>
Date: Tue, 3 Mar 2020 16:16:17 -0800
Subject: [PATCH] Ensure that subprocess.Popen calls happen in the activted
 virtualenv.

Without this the `awsebcli` python module was getting installed to
the location pointed out by `sys.executable` which in this scenario,
wherein the virtual env is activated via an exec/execfile of the
`activate_this.py` code, is not set to that of the virtualenv python
executable and hence the base system's `pip` kicks in and installs
it in the base system's python site-packages path. This further
causes an issue when the eb executable wrapper tries to reach it
at the virtualenv's `bin_location/eb` and results in an `eb` not
found error.
---
 scripts/ebcli_installer.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/ebcli_installer.py b/scripts/ebcli_installer.py
index 7e93666..8183d4d 100644
--- a/scripts/ebcli_installer.py
+++ b/scripts/ebcli_installer.py
@@ -71,6 +71,7 @@
     'py': """#!/usr/bin/env python
 import subprocess
 import sys
+import os
 
 
 def _exec_cmd(args):
@@ -92,7 +93,7 @@ def _exec_cmd(args):
     the return code of the subprocess to remain None. In all such cases, the
     wrapper will assume a failure and return a non-zero exit code.
     \"\"\"
-    p = subprocess.Popen(args)
+    p = subprocess.Popen(args, env=dict(PATH=os.environ['PATH']))  # run it in the virtual env that this script activated
     try:
         p.communicate()
     except KeyboardInterrupt:
@@ -664,6 +665,8 @@ def _exec_cmd(args, quiet):
     """
     Function invokes `subprocess.Popen` in the `shell=True` mode and returns
     the return code of the subprocess.
+    It ensures that the commands are run in the virtualenv activated by
+    `_activate_virtualenv`.
 
     :param args: the args to pass to `subprocess.Popen`
     :param quiet: Whether to avoid displaying output of the subprocess to
@@ -675,7 +678,8 @@ def _exec_cmd(args, quiet):
         ' '.join(args),
         stdout=stdout,
         stderr=stdout,
-        shell=True
+        shell=True,
+        env={'PATH': os.environ['PATH']}  # run it in the virtual env that this script activated
     )
 
     p.communicate()