diff --git a/assets/images/bitcoin.svg b/assets/images/bitcoin.svg new file mode 100644 index 0000000..25fb930 --- /dev/null +++ b/assets/images/bitcoin.svg @@ -0,0 +1,71 @@ + + + + + + + + + + + + + diff --git a/assets/images/bitcoin.svg.import b/assets/images/bitcoin.svg.import new file mode 100644 index 0000000..add84f9 --- /dev/null +++ b/assets/images/bitcoin.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cr22jmymornam" +path="res://.godot/imported/bitcoin.svg-79755ed98620311bbddf37e12b26a2f5.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/images/bitcoin.svg" +dest_files=["res://.godot/imported/bitcoin.svg-79755ed98620311bbddf37e12b26a2f5.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/assets/images/ether.svg b/assets/images/ether.svg new file mode 100644 index 0000000..4f7a16d --- /dev/null +++ b/assets/images/ether.svg @@ -0,0 +1,46 @@ + + + + + + + + diff --git a/assets/images/ether.svg.import b/assets/images/ether.svg.import new file mode 100644 index 0000000..c918227 --- /dev/null +++ b/assets/images/ether.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dof5s5npkcucf" +path="res://.godot/imported/ether.svg-95cc4c8955f72d95a11f8ac501dac1f2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/images/ether.svg" +dest_files=["res://.godot/imported/ether.svg-95cc4c8955f72d95a11f8ac501dac1f2.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/assets/images/test.svg b/assets/images/test.svg new file mode 100644 index 0000000..0110a69 --- /dev/null +++ b/assets/images/test.svg @@ -0,0 +1,70 @@ + + + + + + + + + + + + + diff --git a/assets/images/test.svg.import b/assets/images/test.svg.import new file mode 100644 index 0000000..cca4abb --- /dev/null +++ b/assets/images/test.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cirtdl1um6t8s" +path="res://.godot/imported/test.svg-ef2e8a1cd86af341084177833f877297.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/images/test.svg" +dest_files=["res://.godot/imported/test.svg-ef2e8a1cd86af341084177833f877297.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/models/chain_provider.gd b/models/chain_provider.gd index e0d24d0..e2bd671 100644 --- a/models/chain_provider.gd +++ b/models/chain_provider.gd @@ -133,7 +133,6 @@ func read_conf(): conf.close() - func write_start_script(): print("Writing start script: ", get_start_path()) if FileAccess.file_exists(get_start_path()): @@ -143,7 +142,9 @@ 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() @@ -151,19 +152,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_link("export "+env) + file.store_line("export " + env) file.store_line(cmd) @@ -171,7 +172,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) @@ -179,10 +180,12 @@ 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) @@ -243,3 +246,5 @@ func get_executable_path() -> String: func get_local_zip_hash() -> String: return FileAccess.get_sha256(ProjectSettings.globalize_path(base_dir + "/" + id + ".zip")) + + 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 783c171..68e1dd2 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,16 +483,22 @@ 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" - args = ["-Command", 'Expand-Archive -Force ' + zip_path + ' ' + base_dir] - + 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) - 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... - OS.execute(prog, args) + var result = OS.execute(prog, args) + print("Unzip result: ", result) chain_provider.write_start_script() if Appstate.get_platform() != Appstate.platform.WIN: @@ -510,7 +516,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) diff --git a/ui/main.gd b/ui/main.gd index f7570ed..d09b85e 100644 --- a/ui/main.gd +++ b/ui/main.gd @@ -10,6 +10,7 @@ func _ready(): left_menu.left_menu_button_pressed.connect(self._on_left_menu_button_pressed) settings_tab.hide_settings.connect(self._on_left_menu_button_pressed) + get_tree().root.title += " | " + Appstate.app_config.get_value("", "version") func _on_left_menu_button_pressed(v: int): tab_container.current_tab = v