Merge branch 'srs-branch' of github.com:seriouscatsoserious/drivechai…

…n_launcher into srs-branch

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

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

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

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,46 +142,50 @@ 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()
 			if drivechain == null:
 				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)
 
 		Appstate.platform.MAC:
 			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)
 
 		Appstate.platform.WIN:
 			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"))
 
+
+