Skip to content

Commit

Permalink
Remove update arg from copy_dir
Browse files Browse the repository at this point in the history
  • Loading branch information
qrrk committed Sep 12, 2021
1 parent 331ca2c commit 09cf4c4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
7 changes: 3 additions & 4 deletions scripts/FilesystemHelper.gd
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion scripts/ReleaseInstaller.gd
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 09cf4c4

Please sign in to comment.