From 09cf4c41de71d96ef014ad461c15d56e3365310f Mon Sep 17 00:00:00 2001 From: qrrk <19731636+qrrk@users.noreply.github.com> Date: Sun, 12 Sep 2021 19:28:15 +0300 Subject: [PATCH] Remove update arg from copy_dir --- scripts/FilesystemHelper.gd | 7 +++---- scripts/ReleaseInstaller.gd | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/FilesystemHelper.gd b/scripts/FilesystemHelper.gd index 6dc38a34..cd94c731 100644 --- a/scripts/FilesystemHelper.gd +++ b/scripts/FilesystemHelper.gd @@ -62,7 +62,6 @@ func _copy_dir_internal(data: Array) -> void: var abs_path: String = data[0] var dest_dir: String = data[1] - var update_only: bool = data[2] var dir = abs_path.get_file() var d = Directory.new() @@ -83,14 +82,14 @@ func _copy_dir_internal(data: Array) -> void: emit_signal("status_message", "[u]Source path:[/u] %s, [u]destination path:[/u] %s." % [path, dest_dir.plus_file(dir).plus_file(item)]) elif d.dir_exists(path): - _copy_dir_internal([path, dest_dir.plus_file(dir), update_only]) + _copy_dir_internal([path, dest_dir.plus_file(dir)]) -func copy_dir(abs_path: String, dest_dir: String, update_only := false) -> void: +func copy_dir(abs_path: String, dest_dir: String) -> void: # Recursively copies a directory *into* a new location. var tfe = ThreadedFuncExecutor.new() - tfe.execute(self, "_copy_dir_internal", [abs_path, dest_dir, update_only]) + tfe.execute(self, "_copy_dir_internal", [abs_path, dest_dir]) yield(tfe, "func_returned") tfe.collect() emit_signal("copy_dir_done") diff --git a/scripts/ReleaseInstaller.gd b/scripts/ReleaseInstaller.gd index d00a5b21..b1ecfd46 100644 --- a/scripts/ReleaseInstaller.gd +++ b/scripts/ReleaseInstaller.gd @@ -92,7 +92,7 @@ func _migrate_game_data(from_dir: String, to_dir: String) -> void: if "tilesets" in datatypes: emit_signal("status_message", "Copying tilesets...") - _fshelper.copy_dir(from_dir + "/gfx", to_dir, true) + _fshelper.copy_dir(from_dir + "/gfx", to_dir) yield(_fshelper, "copy_dir_done") if "soundpacks" in datatypes: