cyberarm/w3dhub_linux_launcher
1
0
Fork 0
mirror of https://github.com/cyberarm/w3d_hub_linux_launcher.git synced 2025-12-16 01:02:34 +00:00
Code Issues Projects Releases Wiki Activity

Fixes for linux (Interim Apex not installs and RUNS!)

Browse Source
This commit is contained in:
Cyberarm
2021-11-19 20:27:36 -06:00
parent 561bd78f6b
commit 19eb1a66e9
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/application_manager.rb
View File

@@ -46,7 +46,7 @@ class W3DHub
exe = "#{app_data[:install_directory]}/#{config_exe}" exe = "#{app_data[:install_directory]}/#{config_exe}"
if File.exist?(exe) if File.exist?(exe)
Process.spawn("\"#{exe}\"") Process.spawn("#{wine_command(app_id, channel)}\"#{exe}\"")
end end
end end
end end
@@ -86,9 +86,19 @@ class W3DHub
end end
end end
def wine_command(app_id, channel)
return "" if W3DHub.windows?
if window.settings[:wine_prefix]
"WINEPREFIX=\"#{window.settings[:wine_prefix]}\" \"#{window.settings[:wine_command]}\" "
else
"#{window.settings[:wine_command]} "
end
end
def run(app_id, channel, *args) def run(app_id, channel, *args)
if (app_data = installed?(app_id, channel)) if (app_data = installed?(app_id, channel))
Process.spawn("\"#{app_data[:install_path]}\"", *args) Process.spawn("#{wine_command(app_id, channel)}\"#{app_data[:install_path]}\"", *args)
end end
end end

14
lib/application_manager/task.rb
View File

@@ -98,12 +98,12 @@ class W3DHub
# Quick checks before network and computational work starts # Quick checks before network and computational work starts
def fail_fast def fail_fast
# tar present? # tar present?
tar_present = system("tar --help") bsdtar_present = system("bsdtar --help")
fail!("FAIL FAST: `tar --help` command failed, tar is not installed. Will be unable to unpack packages.") unless tar_present fail!("FAIL FAST: `bsdtar --help` command failed, bsdtar is not installed. Will be unable to unpack packages.") unless bsdtar_present
if W3DHub.unix? if W3DHub.unix?
wine_present = system("which #{window.settings[:wine_command]}") wine_present = system("which #{window.settings[:wine_command]}")
fail!("FAIL FAST: `which wine` command failed, wine is not installed. Will be unable to create prefixes or launch games.") unless wine_prefix fail!("FAIL FAST: `which #{window.settings[:wine_command]}` command failed, wine is not installed. Will be unable to create prefixes or launch games.") unless wine_present
end end
end end
@@ -257,17 +257,19 @@ class W3DHub
def unpack_packages(packages) def unpack_packages(packages)
path = Cache.install_path(@application, @channel) path = Cache.install_path(@application, @channel)
puts "Unpacking packages in '#{path}'..." puts "Unpacking packages in '#{path}'..."
Cache.create_directories(path) Cache.create_directories(path, true)
packages.each do |package| packages.each do |package|
puts " #{package.name}:#{package.version}" puts " #{package.name}:#{package.version}"
package_path = Cache.package_path(package.category, package.subcategory, "#{package.name}.zip", package.version) package_path = Cache.package_path(package.category, package.subcategory, "#{package.name}.zip", package.version)
puts " Running tar command: #{"tar -xf #{package_path} -C #{path}"}" puts " Running bsdtar command: #{"bsdtar -xf #{package_path} -C #{path}"}"
status = system("tar -xf #{package_path} -C #{path}") status = system("bsdtar -xf #{package_path} -C #{path}")
if status if status
else else
puts "COMMAND FAILED!" puts "COMMAND FAILED!"
fail!("Failed to unpack #{package.name}")
break
end end
end end
end end