From 5e15caa1d5b1155960218800964de088396f70f5 Mon Sep 17 00:00:00 2001 From: seriouscatsoserious <121734574+seriouscatsoserious@users.noreply.github.com> Date: Mon, 17 Jun 2024 12:30:04 -0500 Subject: [PATCH 1/2] Revert changes to chain_provider.gd to state before commit c42a652 --- models/chain_provider.gd | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/models/chain_provider.gd b/models/chain_provider.gd index e2bd671..e0d24d0 100644 --- a/models/chain_provider.gd +++ b/models/chain_provider.gd @@ -133,6 +133,7 @@ func read_conf(): conf.close() + func write_start_script(): print("Writing start script: ", get_start_path()) if FileAccess.file_exists(get_start_path()): @@ -142,9 +143,7 @@ func write_start_script(): if id == "testsail" || id == "ethsail" || id == "zsail": env = "SIDESAIL_DATADIR=" + base_dir - - - var cmd = '"' + get_executable_path() + '"' + var cmd = get_executable_path() match id: "thunder", "bitnames", "bitassets": var drivechain = Appstate.get_drivechain_provider() @@ -152,19 +151,19 @@ func write_start_script(): return # Remove explicit network, mainchain RPC, and RPC port configurations - var data_dir = ' -d "' + ProjectSettings.globalize_path(base_dir + '/data') + '"' - var dc_user = ' -u "' + drivechain.rpc_user + '"' - var dc_pass = ' -p "' + drivechain.rpc_password + '"' - cmd = cmd + "" + data_dir + dc_user + dc_pass + var data_dir = " -d " + ProjectSettings.globalize_path(base_dir + "/data") + var dc_user = " -u " + drivechain.rpc_user + var dc_pass = " -p " + drivechain.rpc_password + cmd = cmd + data_dir + dc_user + dc_pass _: - cmd = cmd + ' --conf="' + get_conf_path() + '"' + cmd = cmd + " --conf=" + get_conf_path() var file = FileAccess.open(get_start_path(), FileAccess.WRITE) match Appstate.get_platform(): Appstate.platform.LINUX: file.store_line("#!/bin/bash") if env != "": - file.store_line("export " + env) + file.store_link("export "+env) file.store_line(cmd) @@ -172,7 +171,7 @@ func write_start_script(): file.store_line("#!/bin/bash") cmd = cmd.replace("Application Support", "Application\\ Support") if env != "": - file.store_line("export " + env) + file.store_line("export "+env) file.store_line(cmd) @@ -180,12 +179,10 @@ func write_start_script(): if env != "": file.store_line("set " + env) - file.store_line('start "" ' + cmd) - + file.store_line("start " + cmd) file.close() - func write_dir(): var dir = ProjectSettings.globalize_path(base_dir) @@ -246,5 +243,3 @@ func get_executable_path() -> String: func get_local_zip_hash() -> String: return FileAccess.get_sha256(ProjectSettings.globalize_path(base_dir + "/" + id + ".zip")) - - From 2e9e2a0658c9500b19ed36b211d3804857c51832 Mon Sep 17 00:00:00 2001 From: seriouscatsoserious <121734574+seriouscatsoserious@users.noreply.github.com> Date: Mon, 17 Jun 2024 12:35:57 -0500 Subject: [PATCH 2/2] Revert changes to base_chain_dashboard_panel.gd to state before commit c42a625 --- .../base_chain_dashboard_panel.gd | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/ui/components/dashboard/base_dashboard_panel/base_chain_dashboard_panel.gd b/ui/components/dashboard/base_dashboard_panel/base_chain_dashboard_panel.gd index 68e1dd2..783c171 100644 --- a/ui/components/dashboard/base_dashboard_panel/base_chain_dashboard_panel.gd +++ b/ui/components/dashboard/base_dashboard_panel/base_chain_dashboard_panel.gd @@ -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: @@ -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)