wwine 0.5.0 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7894308cde683c0f748cb6d99aff493061300abc648b593d5b660b0ebe3a8df6
-  data.tar.gz: f93f04f10160712750868fb4f78499c0d1cd825fb741352265bc3b7a267b41f6
+  metadata.gz: 3dc80c72bd69e1e4dfb94f59970ac9a0d13e33dae01aaf045e78bb3aa5d0b7b5
+  data.tar.gz: 7782fb91245eee5dc068c890326e538b8707a9cdedede3e3ae22e7b3236f3264
 SHA512:
-  metadata.gz: '068d62047e7c777409859e99758d372cfbf2be563956a88e738ee3f0aef2a103b1096686e2d9cd304e61fe12543bc22a13fd391d6fabb07607687af17ef1e9ed'
-  data.tar.gz: 840ac03026a7f696950d0c2f31fb8e07dcc55bd056d8ff65c1dcfb52d83335ffbaaa106e708fcf6a6f6d97b7406d6342cfe88e198d6ce6f878e66cf0279723c4
+  metadata.gz: a69c8a650eb88a1815a3c6e08915a762036d85618b14a2eb82290396abe08d4cb9f50c60485f350e2191279933ba96b6e1b17722e043660021c7457cdf99f609
+  data.tar.gz: 31b4af75ed1a7fc8cd251271d78e4f6b3ed5ee2c76000c0570088c2f3d77345b888399c74b208e0ba56b736c989d4b0150825d00e3cde92ee51b2d5fb37d39fa

data/README.md

@@ -5,16 +5,17 @@ wwine (wrapped wine) is a wrapper for the Windows compatibility layer
 single unified interface, complete with full bottle support for all of them.
 
 It integrates well with how the various flavours mange their bottles, so for
-instance applications isntalled using crossover will be manageable through the
+instance applications installed using crossover will be manageable through the
 usual crossover interface.
 
-For vanilla wine, lutris and PlayOnLinux it uses WINEPREFIX to achieve bottle
-support, creating bottles as ~/.wwinebottles/[BOTTLE NAME]
+For vanilla wine, lutris, PlayOnLinux and Proton it uses variants of WINEPREFIX
+to achieve bottle support, creating bottles as ~/.wwinebottles/[BOTTLE NAME]
 
 It supports the following flavours of wine:
 
 - [vanilla wine (winehq)](http://www.winehq.com/)
 - [wine-staging](https://github.com/wine-staging/wine-staging)
+- [Proton (Steam Play)](https://github.com/ValveSoftware/Proton)
 - [Crossover](https://codeweavers.com/)
 - [wine from lutris](https://lutris.net/)
 - [wine from PlayOnLinux](https://www.playonlinux.com/en/)

data/wwine

@@ -22,7 +22,7 @@ require 'open3'
 # Needed to make symlinks
 require 'fileutils'
 # Application version
-$version = '0.5'
+$version = '0.6'
 # The wine flavour to use
 $wine = nil
 # The bottle to use
@@ -212,9 +212,27 @@ def getFromEnviron(path)
 		elsif info['bottle'] == '.wine-pipelight'
 			info['wine'] = 'pipelight'
 			info['bottle'] = '(pipelight)'
+		elsif env['WINEDLLPATH'] =~ /Proton/
+			proton = env['WINEDLLPATH'].sub(/.*Proton\s+([^\/]+).*/,'proton-\1')
+			if proton !~ /\//
+				info['wine'] = proton.downcase.sub(/\s/,'')
+			end
 		end
 		if env['CX_BOTTLE']
 			info['bottle'] = env['CX_BOTTLE']
+		elsif info['wine'] =~ /proton/i
+			bottle = env['__WWINE_INT_XBOTTLE'] || env['WINEPREFIX'] || env['STEAM_COMPAT_DATA_PATH']
+			if bottle
+				if File.basename(bottle) == 'pfx'
+					bottle = File.realpath(bottle+'/../')
+				end
+				bottleId = File.basename(bottle)
+				if bottleId =~ /\D/
+					info['bottle'] = '(?)'
+				else
+					info['bottle'] = 'steam:'+bottleId
+				end
+			end
 		elsif env['__WWINE_INT_XBOTTLE']
 			info['bottle'] = env['__WWINE_INT_XBOTTLE']
 		elsif env['WINEPREFIX']
@@ -234,7 +252,7 @@ end
 #  Description will be reformatted to fit within a normal terminal
 def printHelp (short,long,description)
 	maxlen = 80
-	optionlen = 21
+	optionlen = 26
 	# Check if the short/long are LONGER than optionlen, if so, we need
 	# to do some additional magic to take up only $maxlen.
 	# The +1 here is because we always add a space between them, no matter what
@@ -247,7 +265,7 @@ def printHelp (short,long,description)
 
 	description.split(/ /).each do |part|
 		if(generatedDesc.length > 0)
-			if (currdesc.length + part.length + 1 + 20) > maxlen
+			if (currdesc.length + part.length + 1 + 26) > maxlen
 				generatedDesc.concat("\n")
 				currdesc = ''
 			else
@@ -262,7 +280,7 @@ def printHelp (short,long,description)
 		raise("Option mismatch")
 	end
 	generatedDesc.split(/\n/).each do |descr|
-		printf("%-4s %-16s %s\n",short,long,descr)
+		printf("%-4s %-21s %s\n",short,long,descr)
 		short = ''; long = ''
 	end
 end
@@ -477,6 +495,28 @@ def generateWrapper (wine,bottle,targetFile,wineCommand,args,type = nil)
 	writeWrapper(targetFile ,wwineCmd, wineCommand, $wrapperCwd, wwineInfo, args, wineprefix)
 end
 
+# Purpose: Emulate --version for nonstandard wine
+def emulateVersionOutput(wine)
+	# For CX* we can actually output a useful version number, namely the
+	# wine version that CX* release was based on
+	if wine == 'cxgames' || wine == 'cxoffice' || wine == 'crossover'
+		cxgBin = getCXwithParams(wine,nil,false)
+		cxVer, cxwVer = getCXVersionsFrom( cxgBin )
+		# CX* wine --versions often contain git revisions and other additional
+		# information in the version number, this strips that out.
+		cxwVer.sub!(/-.*/,'')
+		puts 'wine-'+cxwVer
+	# For proton we use the proton version number
+	elsif wine =~ /^proton-/
+		version = wine.sub(/^proton-(\d+.\d+)\D*/,'\1')
+		puts 'wine-'+version
+	# For cedega we just output an invalid version number in the same syntax
+	# as vanilla wine would have done
+	elsif resolveWine(wine) == 'gametree'
+		puts 'wine-0.0.0'
+	end
+end
+
 # Purpose: Sets WINE and WINEPREFIX, and then either outputs them to STDOUT, or
 # 		executes whatever native command was supplied (the logic that handles --env)
 def setEnvAndExec (wine,bottle,cmd,args,type)
@@ -505,6 +545,12 @@ def setEnvAndExec (wine,bottle,cmd,args,type)
 	if type == 'wine' || wine == 'wine' || (File.exists?(wine) && !File.directory?(wine)) || wine =~ /^(pol|lutris)[-:]?/i
 		vputs(V_DBG,"Used ENV/WINEPREFIX method to get bottle")
 		bottlePath = ENV['WINEPREFIX']
+	elsif type == 'proton' || wine =~ /^proton-/
+		vputs(V_DBG,"Used STEAM_COMPAT_DATA_PATH method to get bottle")
+		bottlePath = ENV['STEAM_COMPAT_DATA_PATH']
+		if File.exists?(bottlePath+'/pfx')
+			bottlePath = bottlePath+'/pfx'
+		end
 	elsif resolveWine(wine) == 'gametree'
 		vputs(V_DBG,"Used ENV/cedega method to get bottle")
 		bottlePath = ENV['HOME']+'/.cedega/'+bottle
@@ -746,6 +792,12 @@ def vputs (level,str)
 		str = 'Debug: '+str
 	end
 	if $verbosity >= level
+		# Don't enable debugging output at all if STDOUT is not a tty and we're
+		# running in env mode. In these cases the caller might rely upon parsing
+		# specific output, and including debugging info can cause the caller to fail.
+		if !STDOUT.isatty && ENV['__WWINE_INT_ENVMODE'] == $version
+			return
+		end
 		puts(str)
 	end
 end
@@ -769,12 +821,15 @@ def Help ()
 	printHelp('-h','--help','Display this help text')
 	printHelp('-w','--wine','Select the wine to use. Any wine listed in "wwine --list" or the path to a wine binary or crossover installation directory.')
 	printHelp('-b','--bottle','Use the selected bottle (~/.wwinebottles/[NAME] for wine, CX bottle or cedega folder, depending on the --wine in use). The bottle will be created if it does not exist.')
+	printHelp('','--list-proton-bottles','Output a list of all available Proton/Steam game bottles')
 	printHelp('','--debug','Enable wine debugging output with the supplied levels (using the format of the WINEDEBUG environment variable)')
 	printHelp('','--env','Set the WINE and WINEPREFIX environment variables to match the parameters provided to wwine and optionally run a program with those variables set.')
 	printHelp('','--arch','Set the wine architecture. Accepts win32 and win64. The default is win32 if --wine does not end with "64"')
 	printHelp('-l','--list','List all available wine versions')
 	printHelp('-k','--kill','Attempt to kill all running wine processes')
 	printHelp('','--drykill','Print what --kill would have done, but don\'t actually do anything')
+	printHelp('','--gamemode','Enable Feral GameMode')
+	printHelp('','--no-gamemode','Disable Feral GameMode')
 	printHelp('','--wrap','Write a wrapper script of your current wwine command to the path supplied')
 	printHelp('','--wrapdir','Use the supplied directory as the working directory for the script created by --wrap (default: current directory)')
 	printHelp('-s','--from','Load parameters and program from the wrapper script supplied. Command-line arguments overrides settings from wrapper script.')
@@ -1255,6 +1310,11 @@ def getCXwithParams (wine,bottle, missingIsFatal = true, getBottleDir = false, g
 		return cxdir
 	end
 
+	if bottle =~ /\//
+		puts wine+' (cx) does not support bottles that exist outside of ~/'+bottleDir
+		exit 1
+	end
+
 	final.push(cxdir+'/bin/cxstart')
 	if(bottle != nil && bottle.length > 0)
 		final.push('--bottle',bottle)
@@ -1359,9 +1419,11 @@ def getCustomwithParams(wine,bottle, type = 'POL', missingIsFatal = true, return
 end
 
 # Purpose: Get parameters for Proton
-def getProtonWithParams(wine,bottle, missingIsFatal = true)
+# if multiReturn is true it will return cmd,bottle
+def getProtonWithParams(wine,bottle, missingIsFatal = true, multiReturn = false)
 	command = []
 	protons = getProtons()
+	wine = wine.downcase
 	if !protons[wine]
 		if missingIsFatal
 			puts("Could not find a proton version matching \""+wine+"\"")
@@ -1387,64 +1449,157 @@ def getProtonWithParams(wine,bottle, missingIsFatal = true)
 
 	command.push( protons[wine]+'/proton','run')
 
+	if File.exists?(bottle) && File.basename(bottle) == 'pfx'
+		bottle = File.realpath(bottle+'/../')
+	end
+
 	bottleRoot = ENV['HOME']+'/.wwinebottles/'
-	if !File.exists?(bottleRoot)
-		vputs(V_INFO,bottleRoot+': does not exist, creating')
-		begin
-			Dir.mkdir(bottleRoot)
-		rescue SystemCallError
-			puts('Failed to create directory "'+bottleRoot+": "+$!)
-			puts('Unable to continue.')
-			exit(1)
+	if bottle =~ /^\// && File.exists?(bottle+'/pfx')
+		# Proton uses STEAM_COMPAT_DATA_PATH to point to the bottle location
+		envPut('STEAM_COMPAT_DATA_PATH',bottle)
+	else
+		if !Dir.exists?(bottleRoot)
+			vputs(V_INFO,bottleRoot+': does not exist, creating')
+			begin
+				Dir.mkdir(bottleRoot)
+			rescue SystemCallError
+				puts('Failed to create directory "'+bottleRoot+": "+$!.message)
+				puts('Unable to continue.')
+				exit(1)
+			end
 		end
-	end
-	if !File.exists?(bottleRoot+bottle)
-		vputs(V_INFO,bottleRoot+bottle+': does not exist, creating')
-		begin
-			Dir.mkdir(bottleRoot)
-		rescue SystemCallError
-			puts('Failed to create directory "'+bottleRoot+": "+$!)
-			puts('Unable to continue.')
-			exit(1)
+		if !Dir.exists?(bottleRoot+bottle)
+			vputs(V_INFO,bottleRoot+bottle+': does not exist, creating')
+			begin
+				Dir.mkdir(bottleRoot+bottle)
+			rescue SystemCallError
+				puts('Failed to create directory "'+bottleRoot+": "+$!.message)
+				puts('Unable to continue.')
+				exit(1)
+			end
 		end
+		# Proton always uses /pfx, we make that a symlink to the base bottle
+		if !File.exists?(bottleRoot+bottle+'/pfx')
+			begin
+				FileUtils.ln_s(bottleRoot+bottle,bottleRoot+bottle+'/pfx')
+			rescue SystemCallError
+				puts('Failed to create pfx symlink in '+bottleRoot+bottle+': '+$!.message)
+				puts('Unable to continue')
+				exit(1)
+			end
+		end
+		# Proton uses STEAM_COMPAT_DATA_PATH to point to the bottle location
+		envPut('STEAM_COMPAT_DATA_PATH',bottleRoot+bottle)
 	end
-	# Proton always uses /pfx, we make that a symlink to the base bottle
-	if !File.exists?(bottleRoot+bottle+'/pfx')
-		FileUtils.ln_s(bottleRoot+bottle,bottleRoot+bottle+'/pfx')
-	end
-	# Proton uses STEAM_COMPAT_DATA_PATH to point to the bottle location
-	envPut('STEAM_COMPAT_DATA_PATH',bottleRoot+bottle)
 
 	# Disable wineArch support. Proton uses its own.
-	$wineArch = nil
+	if $wineArch
+		puts "Warning: proton does not support --arch, ignoring."
+		$wineArch = nil
+	end
+
+	# Enable debugging if requested
+	if $wineDebug
+		puts "Notice: proton does not support --debug, ignoring."
+	end
 
 	vputs(V_DBG,'Detected proton: '+command.join(' '))
-	return command
+	if multiReturn
+		return command,bottleRoot+bottle
+	else
+		return command
+	end
 end
 
-# Purpose: Get a list of installed proton versions
-def getProtons ()
-	# Proton gets installed in the same "steam library" directory that the first game
-	# that used said version of Proton is installed to. Thus we need to parse out where
-	# all of Steam's library directories are to be able to produce a complete list.
-	dirs = [ ENV['HOME']+'/.steam/root/SteamApps/common' ]
+# Purpose: Get a list of Proton base directory locations
+def getProtonBaseDirs ()
+	dirs = [ ENV['HOME']+'/.steam/root/SteamApps/', ENV['HOME']+'/.steam/root/steamapps/' ]
 	steamConfigFile = ENV['HOME']+'/.steam/root/config/config.vdf'
 	if File.exists?(steamConfigFile)
 		source = File.open(steamConfigFile)
 		source.each("\n") do |entry|
 			if entry =~ /\s*\"BaseInstallFolder_\d+\"\s*/
 				dir = entry.sub(/^\s*\"BaseInstallFolder_\d+\"\s*\"(.*)\"/,'\1').chomp
-				dirs.push(dir+'/steamapps/common')
+				dirs.push(dir+'/steamapps/')
 			end
 		end
 	end
+	return dirs
+end
+
+# Purpose: Get the name of the game that owns a Proton bottle
+# (converts ID to name)
+def getProtonBottleName (id)
+	dirs = getProtonBaseDirs()
+	dirs.each do |entry|
+		manifestFile = entry+'/appmanifest_'+id+'.acf';
+		if File.exists?(manifestFile)
+			manifest = File.open(manifestFile)
+			manifest.each("\n") do |entry|
+				if entry =~ /\s*\"(name|installdir)\"\s*/
+					return entry.sub(/^\s*\"(name|installdir)\"\s*\"(.*)\"/,'\2').chomp
+				end
+			end
+		end
+	end
+	return nil
+end
+
+# Purpose: Get a list of Proton bottles
+# Returns a hash, mapping the key (ID) to another hash. The inner hash kontains
+# the keys "directory" (path to the bottle) and "name" (name of the game owning
+# the bottle)
+def getProtonBottles ()
+	dirs = getProtonBaseDirs()
+
+	bottles = {}
+	dirs.each do |entry|
+		Dir.glob(entry+'/compatdata/*') do |bottle|
+			if Dir.exists?(bottle+'/pfx')
+				bottle = File.realpath(bottle)
+				id = File.basename(bottle)
+				name = getProtonBottleName(id)
+				if name == nil
+					name = 'uninstalled game ('+bottle+')'
+				end
+				bottles[id] = {
+					"name" => name,
+					"directory" => bottle+'/pfx'
+				}
+			end
+		end
+	end
+	return bottles
+end
+
+# Purpose: Output a list of Proton bottles
+def listProtonBottles ()
+	outFormat = '%-15s: %s'+"\n"
+	bottles = getProtonBottles()
+	begin
+		printf(outFormat,'Bottle','Description')
+		bottles.each do |bottle,meta|
+			printf(outFormat,'steam:'+bottle,meta['name'])
+			vputs(V_DBG,'steam:'+bottle+' is at '+meta['directory'])
+		end
+	rescue => ex
+		handleException(ex)
+	end
+end
+
+# Purpose: Get a list of installed proton versions
+def getProtons ()
+	dirs = getProtonBaseDirs()
+	# Proton gets installed in the same "steam library" directory that the first game
+	# that used said version of Proton is installed to. Thus we need to parse out where
+	# all of Steam's library directories are to be able to produce a complete list.
 	protons = {}
 	# Note: In the case of several identical proton versions we'll just use the last one
 	# we find
 	dirs.each do |entry|
-		Dir.glob(entry+'/Proton*') do |instance|
+		Dir.glob(entry+'/common/Proton*') do |instance|
 			if File.executable?(instance+'/proton')
-				version = instance.sub(/.*Proton\s+(\d+\.\d+).*/,'\1')
+				version = instance.sub(/.*Proton\s+(\d+\.\d+)\s*(.*)?/,'\1\2').sub(/\s/,'').downcase
 				protons['proton-'+version] = instance
 			end
 		end
@@ -1487,6 +1642,19 @@ def runWine (wine,bottle,args)
 	cmd = nil
 	type = nil
 
+	if bottle =~ /^steam:/
+		bottleID = bottle.sub(/^steam:(\d+)/,'\1')
+
+		protonBottles = getProtonBottles()
+
+		if protonBottles[bottleID]
+			bottle = protonBottles[bottleID]['directory']
+		else
+			puts "Unable to find a steam bottle with the ID \""+bottleID+"\""
+			exit 1
+		end
+	end
+
 	if wine == nil
 		type,cmd = getAutoWithParams(bottle)
 		wine = type
@@ -1524,7 +1692,7 @@ def runWine (wine,bottle,args)
 			realWine = wine.sub(/^(pol|lutris)[-:]?/i,'')
 			cmd = getCustomwithParams(realWine,bottle,wine)
 		elsif wine =~ /^proton-/
-			cmd = getProtonWithParams(wine,bottle)
+			cmd,bottle = getProtonWithParams(wine,bottle,true,true)
 		else
 			puts('Unknown --wine: '+wine)
 			if File.directory?(wine)
@@ -1540,28 +1708,36 @@ def runWine (wine,bottle,args)
 		puts('Command detection failed. This is a bug')
 		exit(1)
 	end
+
+	if wine =~ /^proton-/ && args[0] !~ /(\/|\\)/ && !File.exists?(args[0])
+		orig = args[0]
+		['syswow64','system32'].each do |subdir|
+			if File.exists?(bottle+'/drive_c/windows/'+subdir+'/'+args[0]+'.exe')
+				orig = args[0]
+				args[0] = bottle+'/drive_c/windows/'+subdir+'/'+args[0]+'.exe'
+				vputs(V_DBG,'Resolving for Proton: '+orig+' -> '+orig+'.exe'+' -> '+args[0])
+				break
+			elsif File.exists?(bottle+'/drive_c/windows/'+subdir+'/'+args[0])
+				orig = args[0]
+				args[0] = bottle+'/drive_c/windows/'+subdir+'/'+args[0]
+				vputs(V_DBG,'Resolving for Proton: '+orig+' -> '+args[0])
+				break
+			end
+		end
+		if args[0] != orig
+			vputs(V_INFO,'Proton can\'t find Wine commands, therefore '+orig+' is converted to '+args[0])
+			puts 'wwine: Resolved '+orig+' to '+args[0]
+		end
+	end
+
 	cmd.concat(args)
 
 	# If args is a single parameter, that parameter is --version, and we're not using
 	# vanilla wine, then we emulate vanilla wine's --version output. This helps
 	# utilities like winetricks when it is running under "wwine --env"
 	if args.length == 1 && args[0] == '--version'
-		# For CX* we can actually output a useful version number, namely the
-		# wine version that CX* release was based on
-		if wine == 'cxgames' || wine == 'cxoffice' || wine == 'crossover'
-			cxgBin = getCXwithParams(wine,nil,false)
-			cxVer, cxwVer = getCXVersionsFrom( cxgBin )
-			# CX* wine --versions often contain git revisions and other additional
-			# information in the version number, this strips that out.
-			cxwVer.sub!(/-.*/,'')
-			puts 'wine-'+cxwVer
-			exit
-		# For cedega we just output an invalid version number in the same syntax
-		# as vanilla wine would have done
-		elsif resolveWine(wine) == 'gametree'
-			puts 'wine-0.0.0'
-			exit
-		end
+		emulateVersionOutput(wine)
+		exit
 	end
 
 	# If we're in envMode, then we let setEnvAndExec handle the rest
@@ -1619,6 +1795,7 @@ else
 		[ '--debug',GetoptLong::REQUIRED_ARGUMENT ],
 		[ '--cxinstalldir','-c',GetoptLong::REQUIRED_ARGUMENT ],
 		[ '--cxg-installdir','--cxgamesinstalldir','-C',GetoptLong::REQUIRED_ARGUMENT ],
+		[ '--list-proton-bottles',GetoptLong::NO_ARGUMENT ],
 		[ '--version',GetoptLong::NO_ARGUMENT ],
 		[ '--wrap', GetoptLong::REQUIRED_ARGUMENT ],
 		[ '--wrapdir', GetoptLong::REQUIRED_ARGUMENT ],
@@ -1690,6 +1867,9 @@ begin
 		when '--list-wines'
 			listWines()
 			exit(0)
+		when '--list-proton-bottles'
+			listProtonBottles()
+			exit(0)
 		when '--kill'
 			if arg == nil
 				arg = 15

data/wwine.1

@@ -1,5 +1,5 @@
 .IX Title "WWINE 1"
-.TH WWINE 1 "2018-08-28" "wwine 0.5" ""
+.TH WWINE 1 "2018-11-12" "wwine 0.6" ""
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -33,14 +33,9 @@ for \-\-wine for more information.
 Display the help screen
 .IP "\fB\-w, \-\-wine\fR \fI\s-1FLAVOUR\s0\fR" 4
 .IX Item "-w, --wine FLAVOUR"
-Use the supplied flavour of wine. The default is to use vanilla wine.
-
-Possible parameters: wine, wine64, wine-unstable, wine\-unstable64, crossover,
-cxgames, cxoffice, cedega, cx (alias for crossover), cxg (alias for cxgames),
-cxo (alias for cxoffice), /path/to/a/wine.binary or
-/path/to/a/crossover\-installation. Note that if you have crossover, but not
-cxgames installed, wwine will alias cxgames to crossover, to provide a simple
-upgrade path where wrapper scripts 'just work'.
+Use the supplied flavour of wine. The default is to use vanilla wine.  To get a
+list of detected wine flavours you can provide to \fI\-\-wine\fR, run \fIwwine
+\&\-\-list\fR.
 
 If this parameter is not supplied, wwine will attempt to autodetect which wine
 to use, checking for the existance of flavours in the following order, using
@@ -61,6 +56,10 @@ case vanilla wine will use ~/.wine, crossover/cxoffice/cxgames will use the
 bottle defined as default and for cedega a bottle named 'wwineFolder' will be
 used.
 
+The exception to the above are bottles that Steam makes for use with Proton.
+You can use those bottles by specifying \*(L"steam:ID\*(R". To get a list of those
+bottles, run \fIwwine \-\-list\-proton\-bottles\fR.
+
 PlayOnLinux wines are a special case. If a bottle with the name supplied exists
 in ~/.PlayOnLinux/wineprefixes/ then wwine will use that bottle (ie. the existing
 PlayOnLinux bottle), otherwise it will use a bottle in ~/.wwinebottles.
@@ -83,6 +82,9 @@ Disable GameMode if enabled.
 .IX Item "-l, --list"
 List all available wine versions. This will list the names that can be supplied
 to \fI\-\-wine\fR as well as the actual wine version in question.
+.IP "\fB\-\-list\-proton\-bottles\fR" 4
+.IX Item "--list-proton-bottles"
+List all proton bottles.
 .IP "\fB\-k, \-\-kill\fR" 4
 .IX Item "-k, --kill"
 Attempt to kill running wine processes. See also \fI\-\-drykill\fR.
@@ -103,8 +105,8 @@ Print what \fI\-\-kill\fR would have done, without actually doing anything.
 variables, and (optionally) run a native program with those variables
 set. This lets you run any program that uses the \s-1WINE\s0 and \s-1WINEPREFIX\s0
 variables with wwine instead of wine (effectively giving you bottle
-support, as well as support for using crossover/cxgames/cxoffice/.. instead
-of wine).
+support, as well as support for using crossover/cxgames/cxoffice/proton/..
+instead of wine).
 
 When you use \-\-env, wwine will obey \-\-bottle and \-\-wine (or \-\-from) and set
 \&\s-1WINE\s0 and \s-1WINEPREFIX\s0 accordingly. If you supply additional parameters, then
@@ -237,6 +239,9 @@ sending them the \s-1KILL\s0 signal. Should only be used if \*(L"wwine \-k\*(R"
 .IP "\fIwwine \-\-bottle test \-\-wine cx \-\-kill\fR" 4
 .IX Item "wwine --bottle test --wine cx --kill"
 Kill any crossover processes running in the bottle \*(L"test\*(R".
+.IP "\fIwwine \-b steam:201230 \-w proton\-3.16 winecfg\fR" 4
+.IX Item "wwine -b steam:201230 -w proton-3.16 winecfg"
+Runs winecfg in the Steam/Proton bottle for game \s-1ID 201230\s0 using Proton 3.16.
 .SH "SUPPORTED WINE FLAVOURS"
 .IX Header "SUPPORTED WINE FLAVOURS"
 The following flavours of wine are supported:
@@ -251,8 +256,10 @@ versions \*(L"Crossover Office\*(R" and \*(L"Crossover Games\*(R". <http://www.c
 .IX Item "Proton (Steam Play)"
 The wine version used by Steam Play to run Windows games in the native Steam
 client. Note that this does not obey \-\-winearch or \-\-debug, since proton uses
-its own builtin arch detection and debug method. <https://steampowered.com>
-and <https://github.com/ValveSoftware/Proton>.
+its own builtin arch detection and debug method. When using proton, wwine will
+add support for builtin wine commands, like winecfg, which proton can't handle
+by default.  <https://steampowered.com> and
+<https://github.com/ValveSoftware/Proton>.
 .IP "\fBLutris\fR" 4
 .IX Item "Lutris"
 Wine packages installed via Lutris. <https://lutris.net/>
@@ -295,7 +302,7 @@ submit feature requests there as well.
 \&\fBwwine\fR is written by Eskild Hustvedt <\fIcode at zerodogg dot org\fR>
 .SH "LICENSE AND COPYRIGHT"
 .IX Header "LICENSE AND COPYRIGHT"
-Copyright (C) Eskild Hustvedt 2009, 2010, 2011
+Copyright (C) Eskild Hustvedt 2009\-2018
 .PP
 This is free software; see the source for copying conditions.  There is \s-1NO\s0
 warranty; not even for \s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE.\s0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wwine
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: '0.6'
 platform: ruby
 authors:
 - Eskild Hustvedt
 autorequire: 
 bindir: "."
 cert_chain: []
-date: 2018-08-28 00:00:00.000000000 Z
+date: 2018-11-12 00:00:00.000000000 Z
 dependencies: []
 description: wwine is a a wine(1) wrapper. It wraps various flavours of wine (including
   vanilla wine and crossover) into a single unified interface, complete with full
@@ -26,7 +26,7 @@ files:
 - wwine.1
 homepage: http://random.zerodogg.org/wwine
 licenses:
-- GPLv3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []