Add envar precedence help and mapbox-config support

Closes #33
mapbox · Dec 18, 2015 · 3f82212 · 3f82212
1 parent aa28d86
commit 3f82212
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/mapboxcli/scripts/cli.py b/mapboxcli/scripts/cli.py
@@ -49,8 +49,8 @@ def main_group(ctx, verbose, quiet, access_token, config):
 
       $ mapbox --access-token MY_TOKEN ...
 
-    as an environment variable named MAPBOX_ACCESS_TOKEN or
-    MapboxAccessToken
+    as an environment variable named MAPBOX_ACCESS_TOKEN (higher
+    precedence) or MapboxAccessToken (lower precedence).
 
     \b
       $ export MAPBOX_ACCESS_TOKEN=MY_TOKEN

diff --git a/mapboxcli/scripts/config.py b/mapboxcli/scripts/config.py
@@ -22,7 +22,7 @@ def config(ctx):
     if 'MAPBOX_ACCESS_TOKEN' in os.environ:
         click.echo("MAPBOX_ACCESS_TOKEN = {0}".format(
             os.environ['MAPBOX_ACCESS_TOKEN']))
-    elif 'MapboxAccessToken' in os.environ:
+    if 'MapboxAccessToken' in os.environ:
         click.echo("MapboxAccessToken = {0}".format(
             os.environ['MapboxAccessToken']))
     if 'MAPBOX_VERBOSE' in os.environ: