Fixed .git initalization bug

Signed-off-by: Natalia Luzuriaga <natalia.luzuriaga@cms.hhs.gov>
DSACMS · Jan 31, 2025 · f66bebe · f66bebe
1 parent f4880a0
commit f66bebe
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 25 deletions.
diff --git a/tier1/hooks/post_gen_project.py b/tier1/hooks/post_gen_project.py
@@ -30,14 +30,21 @@ def addTopic():
     subprocess.call(gh_cli_command)
 
 def moveCookiecutterFile(): 
-    github_dir = os.path.join(os.getcwd(), ".github")
-    os.chdir(github_dir)
+    original_dir = os.getcwd()
 
-    source_path = "cookiecutter.json"
-    destination_dir = "codejson"
-    destination_path = os.path.join(destination_dir, "cookiecutter.json")
+    try:
+        github_dir = os.path.join(original_dir, ".github")
+        os.chdir(github_dir)
 
-    shutil.move(source_path, destination_path)
+        source_path = "cookiecutter.json"
+        destination_dir = "codejson"
+        destination_path = os.path.join(destination_dir, "cookiecutter.json")
+
+        shutil.move(source_path, destination_path)
+
+    finally:
+        # Moves back to project dir
+        os.chdir(original_dir)
 
 def main():
     moveCookiecutterFile()

diff --git a/tier2/hooks/post_gen_project.py b/tier2/hooks/post_gen_project.py
@@ -71,14 +71,21 @@ def addMaintainer():
                 f.write(line)
 
 def moveCookiecutterFile(): 
-    github_dir = os.path.join(os.getcwd(), ".github")
-    os.chdir(github_dir)
+    original_dir = os.getcwd()
 
-    source_path = "cookiecutter.json"
-    destination_dir = "codejson"
-    destination_path = os.path.join(destination_dir, "cookiecutter.json")
+    try:
+        github_dir = os.path.join(original_dir, ".github")
+        os.chdir(github_dir)
 
-    shutil.move(source_path, destination_path)
+        source_path = "cookiecutter.json"
+        destination_dir = "codejson"
+        destination_path = os.path.join(destination_dir, "cookiecutter.json")
+
+        shutil.move(source_path, destination_path)
+
+    finally:
+        # Moves back to project dir
+        os.chdir(original_dir)
 
 def main():
     if ADD_MAINTAINER == "True":

diff --git a/tier3/hooks/post_gen_project.py b/tier3/hooks/post_gen_project.py
@@ -64,16 +64,21 @@ def addMaintainer():
         f.writelines(lines)
 
 def moveCookiecutterFile(): 
-    github_dir = os.path.join(os.getcwd(), ".github")
-    os.chdir(github_dir)
+    original_dir = os.getcwd()
 
-    source_path = "cookiecutter.json"
-    destination_dir = "codejson"
-    destination_path = os.path.join(destination_dir, "cookiecutter.json")
+    try:
+        github_dir = os.path.join(original_dir, ".github")
+        os.chdir(github_dir)
 
-    shutil.move(source_path, destination_path)
+        source_path = "cookiecutter.json"
+        destination_dir = "codejson"
+        destination_path = os.path.join(destination_dir, "cookiecutter.json")
 
-    print("ALL DONEZO")
+        shutil.move(source_path, destination_path)
+
+    finally:
+        # Moves back to project dir
+        os.chdir(original_dir)
 
 def main():
     if ADD_MAINTAINER == "True":

diff --git a/tier4/hooks/post_gen_project.py b/tier4/hooks/post_gen_project.py
@@ -64,14 +64,21 @@ def addMaintainer():
         f.writelines(lines)
 
 def moveCookiecutterFile(): 
-    github_dir = os.path.join(os.getcwd(), ".github")
-    os.chdir(github_dir)
+    original_dir = os.getcwd()
 
-    source_path = "cookiecutter.json"
-    destination_dir = "codejson"
-    destination_path = os.path.join(destination_dir, "cookiecutter.json")
+    try:
+        github_dir = os.path.join(original_dir, ".github")
+        os.chdir(github_dir)
 
-    shutil.move(source_path, destination_path)
+        source_path = "cookiecutter.json"
+        destination_dir = "codejson"
+        destination_path = os.path.join(destination_dir, "cookiecutter.json")
+
+        shutil.move(source_path, destination_path)
+
+    finally:
+        # Moves back to project dir
+        os.chdir(original_dir)
 
 def main():
     if ADD_MAINTAINER == "True":