Skip to content

Commit

Permalink
Revert changes to base_chain_dashboard_panel.gd to state before commit
Browse files Browse the repository at this point in the history
  • Loading branch information
seriouscatsoserious committed Jun 17, 2024
1 parent 5e15caa commit 2e9e2a0
Showing 1 changed file with 5 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -483,22 +483,16 @@ func _on_download_complete(result, response_code, _headers, body):
func unzip_file_and_setup_binary(base_dir: String, zip_path: String):
var prog = "unzip"
var args = [zip_path, "-d", base_dir]
print(zip_path)
print(base_dir)

if Appstate.get_platform() == Appstate.platform.WIN:
prog = "powershell.exe"
var escaped_zip_path = "'" + zip_path.replace("/", "\\") + "'"
var escaped_base_dir = "'" + base_dir.replace("/", "\\") + "'"
args = ["-Command", "Expand-Archive -Force " + escaped_zip_path + " " + escaped_base_dir]
print(args)
args = ["-Command", 'Expand-Archive -Force ' + zip_path + ' ' + base_dir]


print("Unzipping ", zip_path, ": ", prog, " ", args)
print("Unzipping ", zip_path, ": ", prog, " ", args, )

# We used to check for the exit code here. However, unzipping sometimes
# throw bad errors on symbolic links, but output the files just fine...
var result = OS.execute(prog, args)
print("Unzip result: ", result)
OS.execute(prog, args)

chain_provider.write_start_script()
if Appstate.get_platform() != Appstate.platform.WIN:
Expand All @@ -516,7 +510,7 @@ func unzip_file_and_setup_binary(base_dir: String, zip_path: String):
#OS.execute("chmod", ["+x", ProjectSettings.globalize_path(chain_provider.base_dir + "/" + zside_params_name)])

update_view()


func reset_download():
remove_child(download_req)
Expand Down

0 comments on commit 2e9e2a0

Please sign in to comment.