Merge remote-tracking branch 'origin/develop'

vlaci · Sep 11, 2019 · 009e8e8 · 009e8e8
2 parents f6fe7db + 89c715e
commit 009e8e8
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/openconnect_sso/__init__.py b/openconnect_sso/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "0.2.0"
+__version__ = "0.2.1"
 __description__ = (
     "Wrapper script for OpenConnect supporting Azure AD (SAMLv2) authentication"
 )
diff --git a/openconnect_sso/app.py b/openconnect_sso/app.py
@@ -63,7 +63,7 @@ async def _run(args):
 
     if cfg.default_profile and not args.use_profile_selector:
         selected_profile = cfg.default_profile
-    elif args.use_profile_selector:
+    elif args.use_profile_selector or args.profile_path:
         profiles = get_profiles(Path(args.profile_path))
         if not profiles:
             logger.error("No profile found")

diff --git a/openconnect_sso/cli.py b/openconnect_sso/cli.py
@@ -102,8 +102,8 @@ def main():
         )
 
     if not args.profile_path and not args.server and not config.load().default_profile:
-        if os.path.exists("/opt/cisco/anyconnect/profiles"):
-            args.profile_path = "/opt/cisco/anyconnect/profiles"
+        if os.path.exists("/opt/cisco/anyconnect/profile"):
+            args.profile_path = "/opt/cisco/anyconnect/profile"
         else:
             parser.error(
                 "No Anyconnect profile can be found. One of --profile or --server arguments required."

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openconnect-sso"
-version = "0.2.0"
+version = "0.2.1"
 description = "Wrapper script for OpenConnect supporting Azure AD (SAMLv2) authentication"
 authors = ["László Vaskó <laszlo.vasko@outlook.com>"]
 readme = "README.md"

diff --git a/tests/test_openconnect_sso.py b/tests/test_openconnect_sso.py
@@ -2,4 +2,4 @@
 
 
 def test_version():
-    assert __version__ == '0.2.0'
+    assert __version__ == '0.2.1'