Skip to content

Commit f9d448f

Browse files
authored
Merge pull request #24 from aws/FixIssues
Fix miscellaneous installation problems
2 parents 81e3ee9 + b94e281 commit f9d448f

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ On **Bash** and **Zsh** on OS X/Linux:
3333
**NOTE:** On OS X, if you see installation failing with the following message, "zipimport.ZipImportError: can't decompress data; zlib not available", perform the following exports and then retry the above command:
3434

3535
```bash
36+
brew install zlib
3637
export LDFLAGS="-L/usr/local/opt/zlib/lib"
3738
export CPPFLAGS="-I/usr/local/opt/zlib/include"
3839
```

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.0
1+
0.1.2

scripts/ebcli_installer.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,7 @@ def _create_virtualenv(
426426
"""
427427
virtualenv_location = virtualenv_location or _user_local_directory()
428428
virtualenv_directory = os.path.join(virtualenv_location, VIRTUALENV_DIR_NAME)
429+
python_installation = python_installation or sys.executable
429430

430431
if (
431432
os.path.exists(virtualenv_directory)
@@ -447,11 +448,11 @@ def _create_virtualenv(
447448

448449
virtualenv_args = [
449450
virtualenv_executable or 'virtualenv',
450-
virtualenv_directory
451+
'"{}"'.format(virtualenv_directory)
451452
]
452453

453454
python_installation and virtualenv_args.extend(
454-
['-p', python_installation]
455+
['-p', '"{}"'.format(python_installation)]
455456
)
456457

457458
if _exec_cmd(virtualenv_args, quiet) != 0:
@@ -553,7 +554,10 @@ def _install_ebcli(quiet, version, ebcli_source):
553554
'--upgrade',
554555
'--upgrade-strategy', 'eager',
555556
]
556-
_exec_cmd(install_args, quiet)
557+
returncode = _exec_cmd(install_args, quiet)
558+
559+
if returncode != 0:
560+
exit(returncode)
557561

558562

559563
def _add_ebcli_stamp(virtualenv_directory):

0 commit comments

Comments
 (0)