Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update login script to use ENV variables as well #531

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update login script to use ENV variables as well #531

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions binstar_client/commands/login.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import platform
import socket
import sys
import os

from six.moves.urllib.parse import urlparse
from six.moves import input
Expand Down Expand Up @@ -79,10 +80,14 @@ def interactive_get_token(args, fail_if_already_exists=True):
else:
if getattr(args, 'login_username', None):
username = args.login_username
elif os.getenv('ANACONDA_USERNAME'):
username = os.environ['ANACONDA_USERNAME']
else:
username = input('Username: ')

password = getattr(args, 'login_password', None)
if password is None and os.getenv('ANACONDA_PASSWORD'):
password = os.environ['ANACONDA_PASSWORD']

for _ in range(3):
try:
Expand Down Expand Up @@ -138,7 +143,9 @@ def add_parser(subparsers):
subparser.add_argument('--hostname', default=platform.node(),
help="Specify the host name of this login, this should be unique (default: %(default)s)")
subparser.add_argument('--username', dest='login_username',
help="Specify your username. If this is not given, you will be prompted")
help="Specify your username. If this is not given, you will be prompted. "
"This can also be specified via the ENV variable ANACONDA_USERNAME")
subparser.add_argument('--password', dest='login_password',
help="Specify your password. If this is not given, you will be prompted")
help="Specify your password. If this is not given, you will be prompted. "
"This can also be specified via the ENV variable ANACONDA_PASSWORD")
subparser.set_defaults(main=main)