diff --git a/.fontfoldercleanup/remove_ds_and_clean_empty_folders.py b/.fontfoldercleanup/remove_ds_and_clean_empty_folders.py index 608548e..f01f9a4 100644 --- a/.fontfoldercleanup/remove_ds_and_clean_empty_folders.py +++ b/.fontfoldercleanup/remove_ds_and_clean_empty_folders.py @@ -3,9 +3,7 @@ import os if __name__ == '__main__': # Clean up git repository - os.system(f"cd {cleanup.repo_location}") # Pull the latest changes from the remote repository - os.system("git reset --hard main") # Reset the repository to the 'main' branch, discarding all local changes - os.system("git clean -fdx") # Remove all untracked files and directories, including ignored files + os.system(f"cd {cleanup.repo_location} && git reset --hard main && git clean -fdX") # Change to repo location, reset the repository, and clean untracked files except those in .gitignore cleanup.remove_ds_store_files() # Remove .DS_Store files from the repository cleanup.remove_setup_complete_files() # Remove setup complete files from the repository cleanup.remove_empty_folders() # Remove empty folders from the repository \ No newline at end of file diff --git a/.gitignore b/.gitignore index 02e34fa..33b8fed 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ *.cfg *.g2n *.DS_Store -*.setup_complete \ No newline at end of file +*.setup_complete +.env \ No newline at end of file