Checkout edits

fre/pp/checkoutScript.py

@@ -20,7 +20,7 @@
 
 #############################################
 
-def _checkoutTemplate(experiment, platform, target, branch='empty'):
+def _checkoutTemplate(experiment, platform, target, branch=None):
     """
     Checkout the workflow template files from the repo
     """
@@ -36,11 +36,12 @@ def _checkoutTemplate(experiment, platform, target, branch='empty'):
 
     # branch and version parameters
     default_tag = subprocess.run(["fre","--version"],capture_output=True, text=True).stdout.split()[2]
-    if branch != 'empty':   
+    if branch == None:   
         if os.path.isdir(name): #scenario 4
             os.chdir(name)
-            name_path_tag=subprocess.run(["git","describe","--tags"],capture_output=True, text=True).stdout
-            name_path_branch=subprocess.run(["git","branch"],capture_output=True, text=True).stdout.split()[1]
+            name_path_tag=subprocess.run(["git","describe","--tags"],capture_output=True, text=True).stdout.split('*')
+            name_path_branch = name_path_branch[1].split()[0]
+            name_path_branch=subprocess.run(["git","branch"],capture_output=True, text=True).stdout
             os.chdir(directory)
             if default_tag not in name_path_tag and name_path_branch != branch:
                 stop_report = f"Tag and branch of prexisting directory {diretory}/{name} does not match fre --version or branch requested"
@@ -51,14 +52,14 @@ def _checkoutTemplate(experiment, platform, target, branch='empty'):
     else:
         if os.path.isdir(name): #scenario 3
             os.chdir(name)
-            name_path_tag=subprocess.run(["git","describe","--tags"],capture_output=True, text=True).stdout.split()
+            name_path_tag=subprocess.run(["git","describe","--tags"],capture_output=True, text=True).stdout.split()[0]
             os.chdir(directory)
             if not default_tag in name_path_tag:
                 stop_report = f"Tag of prexisting directory {diretory}/{name} does not match fre --version"
                 sys.exit(stop_report)
                 return 1
         else:   #scenario 1
-            subprocess.run(f'git checkout tags/{default_tags}')
+            subprocess.run(f'git clone --branch={branch} https://github.com/NOAA-GFDL/fre-cli.git')
 
     # Clone the repository with depth=1; check for errors
     click.echo("cloning experiment into directory " + directory + "/" + name)
@@ -93,7 +94,7 @@ def _checkoutTemplate(experiment, platform, target, branch='empty'):
 #############################################
 
 @click.command()
-def checkoutTemplate(experiment, platform, target, branch = 'empty'):
+def checkoutTemplate(experiment, platform, target, branch = None):
     '''
     Wrapper script for calling checkoutTemplate - allows the decorated version
     of the function to be separate from the undecorated version