fix errors in gcm management

ProjectBorealis · Aug 22, 2024 · 9a66f1b · 9a66f1b
1 parent 8d6a288
commit 9a66f1b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/pbpy/pbgit.py b/pbpy/pbgit.py
@@ -60,11 +60,10 @@ def get_gcm_executable(recursed=False):
         [get_git_executable(), "config", "--get", "credential.helper"]
     ).replace("\\", "")
     # no helper installed
-    # TODO: remove -core suffix once deprecated
     if not gcm_exec:
         # try setting GCM
         if not recursed:
-            pbtools.run(["git", "config", "credential.helper", "manager-core"])
+            pbtools.run(["git", "config", "credential.helper", "manager"])
             return get_gcm_executable(recursed=True)
         return None
     # old style
@@ -76,7 +75,7 @@ def get_gcm_executable(recursed=False):
     # helper installed, but not GCM
     if "git-credential-manager" not in gcm_exec:
         if not recursed:
-            pbtools.run(["git", "config", "credential.helper", "manager-core"])
+            pbtools.run(["git", "config", "credential.helper", "manager"])
             return get_gcm_executable(recursed=True)
         return [f"diff.{gcm_exec}"]
     return [gcm_exec]

diff --git a/pbsync/__main__.py b/pbsync/__main__.py
@@ -102,7 +102,7 @@ def sync_handler(sync_val: str, repository_val=None):
                         else:
                             needs_git_update = False
                             # reconfigure credential manager to make sure we have the proper path
-                            pbtools.run(["git", "credential-manager", "configure"])
+                            pbtools.run([*pbgit.get_gcm_executable(), "configure"])
                         os.remove(download_path)
                 else:
                     proc = pbtools.run(
@@ -363,7 +363,7 @@ def sync_handler(sync_val: str, repository_val=None):
                             )
                         else:
                             # reconfigure credential manager to make sure we have the proper path
-                            pbtools.run(["git", "credential-manager", "configure"])
+                            pbtools.run([*pbgit.get_gcm_executable(), "configure"])
                             needs_git_update = False
                         os.remove(download_path)