Merge remote-tracking branch 'origin/master' into j2/progress

scripts/gsrc/update-from-decomp.py

@@ -186,7 +186,6 @@ if args.preserve:
 lines_to_ignore = 0
 i = len(final_lines) - 1
 while i > 0 and (final_lines[i] == "\n" or final_lines[i] == "0\n"):
-    print(final_lines[i])
     lines_to_ignore = lines_to_ignore + 1
     i = i - 1
 

scripts/gsrc/update-gsrc-via-refs.py

@@ -1,6 +1,5 @@
 # Updates files in gsrc if they are modified in the reference test folder
 # Uses git
-# TODO - get new untracked files as well
 import subprocess
 from git import Repo
 

scripts/gsrc/utils.py

@@ -48,5 +48,5 @@ def get_ref_path_from_filename(game_name, file_name, ref_folder):
   if src_path == "":
     print("couldn't determine ref path for {}:{}!".format(game_name, file_name))
     exit(1)
-  path = "{}/{}/{}/{}_REF.gc".format(ref_folder, game_name, src_path, file_name)
+  path = os.path.join(ref_folder, game_name, src_path, "{}_REF.gc".format(file_name))
   return path