wwine 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e0c1328444909d1ab568f2290bc792a4ed4a790f
-  data.tar.gz: 07934726e9f51a60865e240a0edab85f3b850b6f
+SHA256:
+  metadata.gz: ddfd32972c75b495e5bbbbe50ae199142e9f9d362602fca83f2c41264e894690
+  data.tar.gz: 8685c5b8731666a8ff21c263278c1714c78f9d71220d452241dcbb3a79365e8f
 SHA512:
-  metadata.gz: b6b535f272c338396857e9e619a258b3d668aacce073153b0ed0c06945e2b410f0e042bb79f92596ceeeb686a12dba384a2e87e4988d2388a3e511a7ad0dc51c
-  data.tar.gz: 9907eca8940177e1ff09500e2af83b06d91abcacbfecea8a3de0ed018ccd50026a2d8115f7fd63a2fff2e7bf2c49e5880afcc7ee802ccc333658678e908139a2
+  metadata.gz: 684934489489f1d4cd122efe06c08b69a9733c556fb035b09f3d7a396b15744e8b6bace63820b24eee7cc55bd0feb034f26bf03d34cc6ef33a3bd467e76172a8
+  data.tar.gz: 2d10e6dcc66feb60791f0f45a720f93d3ecf1ec7fcfece501074512a746d873dd14512470f9730c1a66798d0d8bcb7e5de75672098e61c3d9f1b9c1febe2a5ef

data/wwine

@@ -20,15 +20,11 @@ require 'getoptlong'
 # To read info for --debuginfo
 require 'open3'
 # Application version
-$version = '0.3'
+$version = '0.4'
 # The wine flavour to use
 $wine = nil
 # The bottle to use
 $bottle = nil
-# CX path
-$cxPath = nil
-# CXG path
-$cxgPath = nil
 # Path to write wrapper to
 $wrapperPath = nil
 # Directory to cd to in a wrapper
@@ -39,9 +35,15 @@ $wwineDataFrom = nil
 $envMode = false
 # true if we're in --tricks mode
 $tricksMode = false
+# Wether to enable (LD_PRELOAD) the Feral Interactive GameMode library
+$preloadGameMode = false
 # A positive integer if we're in --kill or --drykill mode
 # (--drykill = 9999)
 $killMode = nil
+# Wine debugging levels
+$wineDebug = nil
+# The wine architecture
+$wineArch = nil
 # Verbosity level
 $verbosity = 0
 V_INFO=1
@@ -82,8 +84,6 @@ def killWine (signal)
 	end
 	if !dryRun
 		print 'Sending '+sigName+' to the following processes:'+"\n\n"
-	else
-		print 'Would send '+sigName+' to the following processes:'+"\n\n"
 	end
 	format = "%-10s %-12s %-8s %-20s\n"
 	printf(format,'Wine','Bottle','PID','Command')
@@ -176,14 +176,14 @@ def getFromEnviron(path)
 		env = Hash.new
 		source.each("\0") do |entry|
 			key = entry.sub(/^([^=]+)=.*$/,'\1').chomp
-			value = entry.sub(/^[^=]+=(.*)$/,'\1').chomp
+			value = entry.sub(/^[^=]+=(.*)$/,'\1').sub(/\0/,'').chomp
 			env[key] = value
 		end
 
 		if env['CX_BOTTLE']
 			info['bottle'] = env['CX_BOTTLE']
 		elsif env['WINEPREFIX']
-			info['bottle'] = env['WINEPREFIX'].sub(/^.*\/([^\/]+)$/,'\1').chomp
+			info['bottle'] = File.basename(env['WINEPREFIX'])
 		elsif env['__WWINE_INT_XBOTTLE']
 			info['bottle'] = env['__WWINE_INT_XBOTTLE']
 		else
@@ -197,9 +197,10 @@ def getFromEnviron(path)
 			info['wine'] = env['__WWINE_INT_XWINE']
 		elsif env['WINELOADER']
 			info['wine'] = 'wine'
+		elsif info['bottle'] == '.wine-pipelight'
+			info['wine'] = 'pipelight'
+			info['bottle'] = '(pipelight)'
 		end
-		info['wine'].sub!(/\0/,'')
-		info['bottle'].sub!(/\0/,'')
 	end
 	return info
 end
@@ -292,11 +293,13 @@ def writeWrapper (targetFile, wwineCommand, otherCommand, cwd, wwineInfo, args,
 		exit(1)
 	end
 
-	# If CxGamesinstalldir is present, use format v3, otherwise
-	# v2 is fine.
-	metaFormat = 'v2'
-	if wwineInfo['CxGamesinstalldir']
-		metaFormat = 'v3'
+	# --gamemode requires v6, --arch requires v5, otherwise we are v4 compatible
+	if $preloadGameMode
+		metaFormat = 'v6'
+	elsif $wineArch
+		metaFormat = 'v5'
+	else
+		metaFormat = 'v4'
 	end
 
 	file.puts('#!/bin/sh')
@@ -311,9 +314,6 @@ def writeWrapper (targetFile, wwineCommand, otherCommand, cwd, wwineInfo, args,
 	wwineInfo.each do |key,value|
 		file.puts('# wwine'+key+': '+value)
 	end
-	# wwineCmd isn't used in v2 or v3, but v1 outputs an invalid message if it
-	# doesn't exist. wwineCmd (unnumbered) will be dropped in a later version.
-	file.puts('# wwineCmd: nil')
 
 	subN = 0
 	args.each do |sub|
@@ -329,10 +329,10 @@ def writeWrapper (targetFile, wwineCommand, otherCommand, cwd, wwineInfo, args,
 	file.puts("\t"+'wwine="`which wwine 2> /dev/null`"')
 	file.puts('fi')
 	file.puts('if [ "x$wwine" != "x" ]; then')
-	# _WWINE_SCRIPT is currently unused, but is present so that wwine can try
-	# to use '--from' automatically in the future if for some reason there are
-	# backwards-incompatible changes to one of the command-line parameters used
-	# by scripts.
+	# _WWINE_SCRIPT is currently just used to detect if a wrapper script is
+	# being used. But is intended to help wwine use '--from' automatically in
+	# the future if for some reason there are backwards-incompatible changes to
+	# one of the command-line parameters used by scripts.
 	file.puts("\t"+'export _WWINE_SCRIPT="$0"')
 	file.puts("\t"+'exec "$wwine" '+shellQuote(wwineCommand).join(" ")+' "$@"')
 	file.puts('else')
@@ -342,8 +342,18 @@ def writeWrapper (targetFile, wwineCommand, otherCommand, cwd, wwineInfo, args,
 		wineprefix.sub!(/'/,'\\')
 		file.puts("\t"+'export WINEPREFIX='+shellQuote(wineprefix))
 	end
-	if wwineInfo['Wine'] =~ /^pol/i
-		path = getPOLwithParams(wwineInfo['Wine'].sub(/^pol[-:]?/i,''),nil,false,true)
+	if $wineArch
+		file.puts("\t"+'export WINEARCH='+shellQuote($wineArch))
+	end
+	if wwineInfo['Wine'] =~ /^(pol|lutris)/i
+		type = 'POL'
+		if wwineInfo['Wine'] =~ /^lutris/
+			type = 'lutris'
+		end
+		path = getCustomwithParams(wwineInfo['Wine'].sub(/^(pol|lutris)[-:]?/i,''),nil,type,false,true)
+		if path == nil
+			abort("getCustomwithParams returned nil wine. This is a bug")
+		end
 		if ENV['WINEDEBUG'] != nil
 			file.puts("\t"+"export WINEDEBUG="+shellQuote(ENV['WINEDEBUG']))
 		end
@@ -355,6 +365,9 @@ def writeWrapper (targetFile, wwineCommand, otherCommand, cwd, wwineInfo, args,
 			file.puts("\t"+"export WINEDEBUG="+shellQuote(ENV['WINEDEBUG']))
 		end
 	end
+	if $preloadGameMode
+		file.puts("\t"+'export LD_PRELOAD="/usr/\$LIB/libgamemodeauto.so:$LD_PRELOAD"')
+	end
 	file.puts("\t"+"exec "+shellQuote(otherCommand).join(" ")+' "$@"')
 	file.puts('fi')
 	file.puts('echo "Launch script failed. No wwine found and wine command failed to exec."')
@@ -370,23 +383,27 @@ end
 def generateWwineCmd (wine,bottle,wineCommand,type = nil)
 	wwineCmd = []
 	wwineInfo = {
-		'Cxinstalldir' => 'nil',
 		'Dir' => 'nil',
 		'Bottle' => 'nil',
-		'Wine' => 'nil'
+		'Wine' => 'nil',
+		'GameMode' => 'nil',
 	}
 
 	# Generate a wwine command-line
 	if $verbosity > 0
 		wwineCmd.push('--verbose')
 	end
-	if $cxPath
-		wwineCmd.push('--cxinstalldir',$cxPath)
-		wwineInfo['Cxinstalldir'] = $cxPath
+	if $wineDebug
+		wwineCmd.push('--debug',$wineDebug)
+		wwineInfo['Debug'] = $wineDebug
 	end
-	if $cxgPath
-		wwineCmd.push('--cxg-installdir',$cxgPath)
-		wwineInfo['CxGamesinstalldir'] = $cxgPath
+	if $wineArch
+		wwineCmd.push('--arch',$wineArch)
+		wwineInfo['Arch'] = $wineArch
+	end
+	if $preloadGameMode
+		wwineCmd.push('--gamemode')
+		wwineInfo['GameMode'] = 'true'
 	end
 	if wine
 		wwineCmd.push('--wine',wine)
@@ -427,7 +444,7 @@ def generateWrapper (wine,bottle,targetFile,wineCommand,args,type = nil)
 
 	# For wine there is no --bottle definition in the wine command itself,
 	# so we need to export a wineprefix in the launch script
-	if (type == 'wine' || type =~ /^pol[-:]/) && ENV['WINEPREFIX']
+	if (type == 'wine' || type =~ /^(pol|lutris)[-:]/) && ENV['WINEPREFIX']
 		wineprefix = ENV['WINEPREFIX'].dup
 	end
 
@@ -440,9 +457,9 @@ def setEnvAndExec (wine,bottle,cmd,args,type)
 	if wine == nil
 		type,cmd = getAutoWithParams(bottle)
 	end
-	envPut('_WWINE_INT_WINE',wine)
+	envPut('__WWINE_INT_WINE',wine)
 
-	if wine == 'cxoffice' || wine == 'cxgames' || wine == 'crossover'
+	if type == 'crossover'
 		cxdir = getCXwithParams(wine,bottle,true,false,true)
 		if File.executable?(cxdir+'/bin/wineserver')
 			envPut('WINESERVER',cxdir+'/bin/wineserver')
@@ -458,21 +475,26 @@ def setEnvAndExec (wine,bottle,cmd,args,type)
 	if $verbosity > 0
 		envPut('__WWINE_INT_VERBOSITY',$verbosity.to_s)
 	end
-	if $cxPath
-		envPut('__WWINE_INT_CXPATH',$cxPath);
-	end
-	if $cxgPath
-		envPut('__WWINE_INT_CXGPATH',$cxgPath);
-	end
 
-	if wine == 'wine' || File.exists?(wine)
+	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 resolveWine(wine) == 'gametree'
+		vputs(V_DBG,"Used ENV/cedega method to get bottle")
 		bottlePath = ENV['HOME']+'/.cedega/'+bottle
 	else
+		vputs(V_DBG,"Used CX method to get bottle")
 		bottlePath = getCXwithParams(wine,bottle,true,true)
 	end
+	if $wineArch
+		envPut('WINEARCH',$wineArch)
+		envPut('__WWINE_INT_WINEARCH',$wineArch)
+	end
 
+	if bottlePath == nil
+		puts "ERROR: setEnvAndExec() has no bottlePath"
+		exit 1
+	end
 	envPut('WINEPREFIX',bottlePath)
 	envPut('WINE',File.expand_path($0))
 	if args.length > 0
@@ -512,9 +534,6 @@ def loadWwineDataFromFile (file,dryRun = false)
 		end
 
 		info = Hash.new
-		# Default entries
-		info['CxGamesinstalldir'] = 'nil'
-		info['Cxinstalldir'] = 'nil'
 
 		source.each do |line|
 			if line.match(/^#\s+wwine/)
@@ -529,22 +548,28 @@ def loadWwineDataFromFile (file,dryRun = false)
 			puts "Unable to continue."
 			exit(0)
 		end
-		if info['Info'] == 'v2' || info['Info'] == 'v3'
+		# FIXME: Should convert info version to an integer and just check that
+		if info['Info'] == 'v2' || info['Info'] == 'v3' || info['Info'] == 'v4' || info['Info'] == 'v5' || info['Info'] == 'v6'
+			vputs(V_DBG,'File contains wwine metadata '+info['Info'])
 			info = parseWwineDataV2(info);
 		elsif info['Info'].match(/^v1/)
-			info = parseWwineDataV1(info)
 			if ! $wrapperPath
-				puts "-- Note: --"
-				puts "This file is using the wwine metadata format v1."
-				puts "This format has been deprecated and support for it will be dropped in"
-				puts "a later version of wwine. You may upgrade it with this command:"
-				puts "wwine --from "+shellQuote(file)+" --wrap "+shellQuote(file+'.new')+" && mv "+shellQuote(file)+" "+shellQuote(file+'.old')+' && mv '+shellQuote(file+'.new')+' '+shellQuote(file)
-				puts "--       --"
+				puts "ERROR: Unsupported wwine metadata format (v1)"
+				puts ""
+				puts "This format is no longer supported directly, and even upgrade support will"
+				puts "be removed in a later version of wwine. To upgrade the file to the new"
+				puts "wwine format, run this command:"
+				puts " wwine --from "+shellQuote(file)+" --wrap "+shellQuote(file+'.new')+" && mv "+shellQuote(file)+" "+shellQuote(file+'.old')+' && mv '+shellQuote(file+'.new')+' '+shellQuote(file)
 				puts ""
+				puts "This will upgrade the file, while leaving an old backup copy in place with a"
+				puts ".old-extension. You may delete the .old file if you have never edited the"
+				puts "script directly, or after you have copied over your changes."
+				exit(1)
 			end
+			info = parseWwineDataV1(info)
 		else
 			version = info['Info'].sub(/^(v\S+).+/,'\1').chomp
-			puts "This version of wwine supports info format v1, v2 and v3."
+			puts "This version of wwine supports info format v2, v3, v4, v5 and v6."
 			puts "This file is version "+version
 			puts "Unable to continue."
 			exit(0)
@@ -579,6 +604,15 @@ def loadWwineDataFromFile (file,dryRun = false)
 		# Get the --wine to use
 		if $wine == nil && info['Wine'] != 'nil'
 			$wine = info['Wine']
+			# Support for legacy Cx*installdir
+			if info['Cxinstalldir'] != 'nil' && info['Cxinstalldir'] != nil
+				vputs(V_DBG,'Converting Cxinstalldir entry to a Wine entry')
+				$wine = info['Cxinstalldir']
+			end
+			if info['CxGamesinstalldir'] != 'nil' && info['CxGamesinstalldir'] != nil
+				vputs(V_DBG,'Converting CxGamesinstalldir entry to a Wine entry')
+				$wine = info['CxGamesinstalldir']
+			end
 			printf(outFormat,outMessage+'--wine',$wine)
 		end
 
@@ -588,14 +622,21 @@ def loadWwineDataFromFile (file,dryRun = false)
 			printf(outFormat,outMessage+'--bottle',$bottle)
 		end
 
-		# Get the --cxinstalldir to use
-		if $cxPath == nil && info['Cxinstalldir'] != 'nil'
-			$cxPath = info['Cxinstalldir']
-			printf(outFormat,outMessage+'--cxinstalldir',$cxPath)
+		# Set wineArch
+		if info['Arch']
+			if info['Arch'] == 'win32' || info['Arch'] == 'win64'
+				$wineArch = info['Arch']
+				printf(outFormat,outMessage+'--arch ',$wineArch)
+			else
+				puts('WARNING: Arch: '+info['Arch']+' is invalid, ignoring!')
+			end
 		end
-		if $cxgPath == nil && info['CxGamesinstalldir'] != 'nil'
-			$cxgPath = info['CxGamesinstalldir']
-			printf(outFormat,outMessage+'--cxg-installdir',$cxgPath)
+
+		# Enable GameMode if needed
+		if info['GameMode'] && info['GameMode'] == 'true'
+			$preloadGameMode = true
+			# FIXME: Drop the 'true'
+			printf(outFormat,outMessage+'--gamemode','true')
 		end
 
 		# Set the command to run
@@ -619,10 +660,16 @@ def parseWwineDataV1 (rawData)
 	unquoteShellArray(rawData['Info'],data)
 	info = Hash.new
 	info['Dir'] = data[1]
-	info['Wine'] = data[2]
+	info['Wine'] = resolveWine(data[2])
 	info['Bottle'] = data[3]
 	info['Cxinstalldir'] = data[4]
 
+	if info['Wine'] == 'crossover' || info['Wine'] == 'cxgames'
+		if info['Cxinstalldir']
+			info['Wine'] = info['Cxinstalldir']
+		end
+	end
+	
 	cmd = []
 
 	unquoteShellArray(rawData['Cmd'],cmd)
@@ -630,7 +677,7 @@ def parseWwineDataV1 (rawData)
 	return info
 end
 
-# Parses wwine metadata version 2 (wwine 0.2+)
+# Parses wwine metadata version 2+ (wwine 0.2+)
 def parseWwineDataV2 (data)
 	cmd = []
 	currNo = 0
@@ -679,6 +726,10 @@ end
 
 # Purpose: Set an environment variable
 def envPut (name,value)
+	if value == nil
+		puts "ERROR: Tried to set nil env var: '"+name+"'"
+		exit 1
+	end
 	vputs(V_DBG,'Set '+name+'='+value)
 	ENV[name] = value;
 end
@@ -690,14 +741,14 @@ def Help ()
 	puts "Usage: wwine (WWINE PARAMETERS) PROGRAM -- [PROGRAM ARGUMENTS]"
 	puts ""
 	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.')
+	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('','--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('-c','--cxinstalldir','Use the supplied path as the install path for Crossover (default: autodetect).')
-	printHelp('-C','--cxg-installdir','Use the supplied path as the install path for CXGames (default: autodetect)')
 	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.')
@@ -808,8 +859,6 @@ def getGameTreeVersionString ()
 		if cedegaVer == nil
 			cedegaVer = 'present'
 		end
-	else
-		cedegaVer = '(not present)'
 	end
 
 	return cedegaVer
@@ -852,7 +901,7 @@ def getCXVersionsFrom (source,wantString = false)
 				return cxVer
 			end
 		else
-			return '(not present)'
+			return nil
 		end
 	else
 		return cxVer,cxwVer
@@ -906,7 +955,7 @@ def listWines(debug = false)
 		if inPath('wine')
 			wineVer = getWineVersion()
 			printf(outFormat,'wine',wineVer)
-			if defaultWine == 'wine'
+			if defaultWine == 'wine' && !debug
 				puts "   (default when no --wine is specified)"
 			end
 		end
@@ -922,29 +971,57 @@ def listWines(debug = false)
 		cxoBin = getCXwithParams('cxoffice',nil,false)
 		cxoVer = getCXVersionsFrom(cxoBin,true)
 
-		if (cxgBin || !cxoBin)
-			printf(outFormat,'cxgames',cxgVer)
-			puts "   (aliases for cxgames: cxg, cxgames)"
+		if (cxgBin || !cxoBin || debug)
+			printf(outFormat,'cxgames',cxgVer || '(not present)')
+			if !debug
+				puts "   (aliases for cxgames: cxg, cxgames)"
+			end
 		end
 
-		if cxoVer
+		if cxoVer || debug
 			printf(outFormat,'crossover',cxoVer)
-			if !cxgBin
-				puts "   (aliases for crossover: cx, cxo, cxg, cxoffice, cxgames)"
-			else
-				puts "   (aliases for crossover: cx, cxo, cxoffice)"
+			if !debug
+				if !cxgBin
+					puts "   (aliases for crossover: cx, cxo, cxg, cxoffice, cxgames)"
+				else
+					puts "   (aliases for crossover: cx, cxo, cxoffice)"
+				end
 			end
 		end
 
 		cedegaVer = getGameTreeVersionString()
-		if cedegaVer
-			printf(outFormat,'gametree',cedegaVer)
-			puts "   (aliases for gametree: cedega)"
+		if cedegaVer || debug
+			printf(outFormat,'gametree',cedegaVer || '(not present)')
+			if ! debug
+				puts "   (aliases for gametree: cedega)"
+			end
 		end
 
 		Dir.glob(ENV['HOME']+'/.PlayOnLinux/wine/linux-*/*') do |dir|
-			name = dir.sub(/^.*\/([^\/]+)/,'\1')
-			printf(outFormat,'pol-'+name,getWineVersion(dir+'/bin/wine'))
+			if File.executable?(dir+'/bin/wine')
+				name = dir.sub(/^.*\/([^\/]+)/,'\1')
+				printf(outFormat,'pol-'+name,getWineVersion(dir+'/bin/wine'))
+			end
+		end
+
+		Dir.glob(ENV['HOME']+'/.local/share/lutris/runners/wine/*') do |dir|
+			if File.executable?(dir+'/bin/wine')
+				name = dir.sub(/^.*\/([^\/]+)/,'\1')
+				printf(outFormat,'lutris-'+name,getWineVersion(dir+'/bin/wine'))
+			end
+		end
+
+		if $wine != nil && debug
+			version = nil
+			if File.directory?($wine)
+				cxBin = getCXwithParams($wine,nil,false)
+				version = getCXVersionsFrom(cxBin,true)
+			elsif File.executable?($wine)
+				version = getWineVersion($wine)
+			end
+			if version != nil
+				printf(outFormat,$wine,version)
+			end
 		end
 	rescue => ex
 		handleException(ex)
@@ -969,7 +1046,16 @@ end
 # Purpose: Get parameters for wine
 def getWineWithParams (wine,bottle, missingIsFatal = true, playOnLinux = false)
 	final = []
-	possibleWines = [ 'wine32','wine','wine64','wine.bin','wine.real','wine-unstable','wine32-unstable' ]
+	possibleWines = []
+	if wine =~ /^wine(64|32|-unstable(32|64)?)$/
+		possibleWines = [ wine ]
+	else
+		if $wineArch && $wineArch == 'win64'
+			possibleWines = [ 'wine64','wine-unstable64','wine','wine.bin','wine.real','wine-unstable' ]
+		else
+			possibleWines = [ 'wine32','wine','wine64','wine.bin','wine.real','wine-unstable','wine32-unstable' ]
+		end
+	end
 	# Manual search path, in the odd case none of the above are in $PATH.
 	# Ie. /usr/lib32/wine/wine.bin is the real wine binary on Debian
 	searchPath = [ '/usr/lib32/wine/','/usr/bin','/usr/lib/i386-linux-gnu/wine-unstable','/usr/lib/i386-linux-gnu/wine', ]
@@ -1046,8 +1132,11 @@ def getWineWithParams (wine,bottle, missingIsFatal = true, playOnLinux = false)
 		envPut('WINEPREFIX',bottle)
 	end
 
-	# Default to no debugging output if WINEDEBUG is not set yet
-	if ! ENV.has_key?('WINEDEBUG')
+	# Enable debugging if requested
+	if $wineDebug
+		envPut('WINEDEBUG',$wineDebug)
+		# Default to no debugging output if WINEDEBUG is not set yet
+	elsif ! ENV.has_key?('WINEDEBUG')
 		envPut('WINEDEBUG','-all')
 	end
 
@@ -1059,30 +1148,33 @@ end
 def getCXwithParams (wine,bottle, missingIsFatal = true, getBottleDir = false, getCXpath = false)
 	final = []
 	cxdir = nil
+	pathMode = nil
 
-	installName = wine
-	if wine == 'crossover'
-		installName = 'cxoffice'
-	end
-	mode = wine
-	bottleDir = '.'+installName
-
-	# Various crossover install paths
-	wines = ['/opt/'+installName, ENV['HOME']+'/'+installName, ENV['HOME']+'/.local/'+installName, ENV['HOME']+'/games/'+installName]
+	if File.directory?(wine)
+		if Dir.glob(wine+'/etc/cxgames*.conf').length > 0
+			installName = 'cxgames'
+			mode = 'cxgames'
+		else
+			installName = 'cxoffice'
+			mode = 'crossover'
+		end
+		pathMode = wine
+		wines = [ wine ]
+	else
+		installName = wine
+		if wine == 'crossover'
+			installName = 'cxoffice'
+		end
+		mode = wine
 
-	pathMode = nil
-	# If cxpath is set then overwrite the default paths
-	if wine == 'cxgames' && $cxgPath != nil
-		pathMode = $cxgPath
-		wines = [ $cxgPath+'/'+installName, $cxgPath ]
-	elsif $cxPath != nil
-		pathMode = $cxPath
-		wines = [ $cxPath+'/'+installName, $cxPath ]
+		# Various crossover install paths
+		wines = ['/opt/'+installName, ENV['HOME']+'/'+installName, ENV['HOME']+'/.local/'+installName, ENV['HOME']+'/games/'+installName]
 	end
+	bottleDir = '.'+installName
 
 	wines.each do |path|
 		if File.exists?(path)
-			if ( File.executable?(path+'/bin/cximportbottles') || File.executable?(path+'/bin/crossover') ) and wine != 'cxgames'
+			if ( File.executable?(path+'/bin/cximportbottles') || File.executable?(path+'/bin/crossover') ) and installName != 'cxgames'
 				# Perform additional detection of dotDir, as that one tends to change
 				dotDir = Dir.glob(path+'/etc/cxoffice*.conf').shift
 				if( dotDir != nil && dotDir.sub!(/^.*(cxoffice\d*)\.conf$/,'\1') )
@@ -1100,7 +1192,7 @@ def getCXwithParams (wine,bottle, missingIsFatal = true, getBottleDir = false, g
 
 	# If we're using $cx*Path, perform some additional detection
 	if pathMode != nil and mode != 'crossover'
-		if File.exists?(pathMode+'/etc/'+wine+'.conf')
+		if File.exists?(pathMode+'/etc/'+installName+'.conf')
 			cxdir = pathMode
 		else
 			cxdir = nil
@@ -1110,7 +1202,7 @@ def getCXwithParams (wine,bottle, missingIsFatal = true, getBottleDir = false, g
 	# If the dir does not exist, give up
 	if not cxdir
 		if !missingIsFatal
-			vputs(V_DBG,'Failed to detect cxdir')
+			vputs(V_DBG,'Failed to detect cxdir for '+mode)
 			return nil
 		end
 		if pathMode != nil
@@ -1121,20 +1213,10 @@ def getCXwithParams (wine,bottle, missingIsFatal = true, getBottleDir = false, g
 			else
 				reverse = 'cxgames'
 			end
-			if $cxPath != nil && pathMode == $cxPath
-				if File.exists?($cxPath+'/'+reverse) || File.exists?($cxPath+'/etc/'+reverse+'.conf')
-					puts('The directory looks like a '+reverse+' directory. Maybe you wanted')
-					puts('--wine '+reverse+' instead?')
-				end
-			end
 		else
-			puts('Failed to locate '+wine)
+			puts('Failed to locate '+wine+ ' (cx)')
 			puts('You could try to explicitly tell wwine where '+wine+' is installed')
-			if wine == 'cxgames'
-				puts('by supplying --cxg-installdir')
-			else
-				puts('by supplying --cxinstalldir')
-			end
+			puts('by supplying the full path to --wine')
 		end
 		exit(1)
 	elsif getCXpath
@@ -1145,10 +1227,13 @@ def getCXwithParams (wine,bottle, missingIsFatal = true, getBottleDir = false, g
 	if(bottle != nil && bottle.length > 0)
 		final.push('--bottle',bottle)
 	end
+	if $wineDebug
+		final.push('--debugmsg',$wineDebug)
+	end
 	final.push('--');
 
 	# Create the bottle if it does not exist
-	if bottle != nil and ! File.exists?(ENV['HOME']+'/'+bottleDir+'/'+bottle)
+	if bottle != nil && !File.exists?(ENV['HOME']+'/'+bottleDir+'/'+bottle)
 		vputs(V_DBG,ENV['HOME']+'/'+bottleDir+'/'+bottle+' did not exist')
 		puts 'The bottle '+bottle+' did not exist, creating...'
 		runcmd([ cxdir+'/bin/cxbottle', '--bottle',bottle,'--create','--template','winxp'],'system')
@@ -1186,6 +1271,10 @@ def getGameTreeWithParams (wine,bottle, missingIsFatal = true)
 
 	final.push(gametreeBin,'--install')
 
+	if $wineDebug
+		finalpush('--debugmsg',$wineDebug)
+	end
+
 	# Use wwineFolder as the folder if no bottle was supplied
 	if (bottle == nil || bottle.length == 0)
 		bottle = 'wwineFolder'
@@ -1196,9 +1285,16 @@ def getGameTreeWithParams (wine,bottle, missingIsFatal = true)
 	return final
 end
 
-# Purpose: Get parameters for PlayOnLinux
-def getPOLwithParams(wine,bottle, missingIsFatal = true, returnDetected = false)
-	winePaths = [ ENV['HOME']+'/.PlayOnLinux/wine/linux-x86', ENV['HOME']+'/.PlayOnLinux/wine/linux-amd64' ]
+# Purpose: Get parameters for PlayOnLinux or Lutris
+def getCustomwithParams(wine,bottle, type = 'POL', missingIsFatal = true, returnDetected = false)
+	winePaths = []
+	polMode = true
+	if type =~ /^pol/i
+	 	winePaths = [ ENV['HOME']+'/.PlayOnLinux/wine/linux-x86', ENV['HOME']+'/.PlayOnLinux/wine/linux-amd64' ]
+	else
+		polMode = false
+		winePaths = [ ENV['HOME']+'/.local/share/lutris/runners/wine/' ]
+	end
 	detectedWine = nil
 	detectedWineDir = nil
 	winePaths.each do |path|
@@ -1227,7 +1323,7 @@ def getPOLwithParams(wine,bottle, missingIsFatal = true, returnDetected = false)
 	envPut('WINELOADER',detectedWine)
 	envPut('WINEDLLPATH',detectedWineDir+'/lib/wine:'+ENV['WINEDLLPATH'].to_s)
 	envPut('LD_LIBRARY_PATH',detectedWineDir+'/lib:'+ENV['LD_LIBRARY_PATH'].to_s)
-	getWineWithParams(detectedWine,bottle,missingIsFatal,true)
+	return getWineWithParams(detectedWine,bottle,missingIsFatal,polMode)
 end
 
 # Purpose: Detect which wine to use and get parameters for that one
@@ -1273,7 +1369,15 @@ def runWine (wine,bottle,args)
 		wine = resolveWine(wine)
 		type = wine
 
-		if wine == 'cxgames' || wine == 'cxoffice' || wine == 'crossover'
+		if File.directory?(wine)
+			if File.executable?(wine+'/bin/cxstart')
+				vputs(V_DBG,wine+': looks like a cx directory, assuming type=cx')
+				type = 'crossover'
+			end
+		end
+
+		if type == 'crossover' || wine == 'cxgames' || wine == 'cxoffice' || wine == 'crossover'
+			type = 'crossover'
 			missingIsFatal = true
 			if wine == 'cxgames'
 				missingIsFatal = false
@@ -1285,17 +1389,22 @@ def runWine (wine,bottle,args)
 					puts('Converting --wine cxgames to --wine crossover since cxgames is not installed')
 				end
 			end
-		elsif wine == 'wine' || File.executable?(wine)
+		elsif wine =~ /^wine(64|32|-unstable(32|64)?)?$/ || ( File.executable?(wine) && !File.directory?(wine) )
 			type = 'wine'
 			cmd = getWineWithParams(wine,bottle)
 		elsif resolveWine(wine) == 'gametree'
 			cmd = getGameTreeWithParams(wine,bottle)
-		elsif wine =~ /^pol[-:]?/i
-			realWine = wine.sub(/^pol[-:]?/i,'')
-			cmd = getPOLwithParams(realWine,bottle)
+		elsif wine =~ /^(pol|lutris)[-:]?/i
+			realWine = wine.sub(/^(pol|lutris)[-:]?/i,'')
+			cmd = getCustomwithParams(realWine,bottle,wine)
 		else
 			puts('Unknown --wine: '+wine)
+			if File.directory?(wine)
+				puts(wine+' does not appear to be the path to a crossover installation directory')
+				puts('')
+			end
 			puts('Must be one of: wine, crossover, cxgames, cedega, or the path to a wine executable')
+			puts('or a crossover installation directory')
 			exit(1)
 		end
 	end
@@ -1340,6 +1449,16 @@ def runWine (wine,bottle,args)
 		if bottle
 			envPut('__WWINE_INT_XBOTTLE',bottle);
 		end
+		if $wineArch
+			envPut('WINEARCH',$wineArch)
+		end
+		if $preloadGameMode
+			preload = '/usr/$LIB/libgamemodeauto.so'
+			if ENV['LD_PRELOAD']
+				preload = preload+':'+ENV['LD_PRELOAD']
+			end
+			envPut('LD_PRELOAD',preload)
+		end
 		runcmd(cmd)
 	end
 end
@@ -1355,17 +1474,21 @@ if ENV['__WWINE_INT_ENVMODE'] == $version
 	if ENV['__WWINE_INT_VERBOSITY'] && ENV['__WWINE_INT_VERBOSITY'].to_i > 0
 		$verbosity = ENV['__WWINE_INT_VERBOSITY'].to_i
 	end
-	if ENV['__WWINE_INT_CXPATH']
-		opts['--cxinstalldir'] = ENV['__WWINE_INT_CXPATH']
-	end
 	opts['--bottle'] = ENV['__WWINE_INT_BOTTLE']
+	if ENV['__WWINE_INT_WINEARCH']
+		opts['--arch'] = ENV['__WWINE_INT_WINEARCH']
+	end
 else
 	opts = GetoptLong.new(
 		[ '--help', '-h', GetoptLong::NO_ARGUMENT ],
 		[ '--wine', '-w', GetoptLong::REQUIRED_ARGUMENT ],
 		[ '--bottle', '-b', GetoptLong::REQUIRED_ARGUMENT ],
+		[ '--arch', GetoptLong::REQUIRED_ARGUMENT ],
 		[ '--kill', '-k', GetoptLong::OPTIONAL_ARGUMENT ],
-		[ '--drykill', GetoptLong::NO_ARGUMENT ],
+		[ '--gamemode','-g', GetoptLong::NO_ARGUMENT ],
+		[ '--no-gamemode', GetoptLong::NO_ARGUMENT ],
+		[ '--running','--drykill', GetoptLong::NO_ARGUMENT ],
+		[ '--debug',GetoptLong::REQUIRED_ARGUMENT ],
 		[ '--cxinstalldir','-c',GetoptLong::REQUIRED_ARGUMENT ],
 		[ '--cxg-installdir','--cxgamesinstalldir','-C',GetoptLong::REQUIRED_ARGUMENT ],
 		[ '--version',GetoptLong::NO_ARGUMENT ],
@@ -1397,21 +1520,41 @@ end
 
 # Handle command-line arguments
 begin
+	overrideCX = nil
+	overrideCXG = nil
 	opts.each do |opt, arg|
 		case opt
 		when '--help'
 			Help()
 			exit(0)
+		when '--gamemode'
+			$preloadGameMode = true
+		when '--no-gamemode'
+			$preloadGameMode = false
 		when '--wine'
 			$wine = arg
 		when '--bottle'
 			$bottle = arg
 		when '--verbose'
 			$verbosity = $verbosity+1
-		when '--drykill'
+		when '--running'
 			$killMode = 9999
 		when '--debuginfo'
 			debugInfo()
+		when '--debug'
+			$wineDebug = arg
+		when '--arch'
+			if arg == '32' || arg == '32bit' || arg == 'i386'
+				arg = 'win32'
+			elsif arg == '64' || arg == '64bit' || arg == 'x86_64'
+				arg = 'win64'
+			end
+			if arg == 'win32' || arg == 'win64'
+				$wineArch = arg
+			else
+				puts('Invalid --arch parameter"'+arg+'". Must be one of: win32, win64')
+				puts('(accepted aliases: 32, 32bit, i386, 64, 64bit, x86_64)')
+			end
 		when '--list-wines'
 			listWines()
 			exit(0)
@@ -1421,15 +1564,21 @@ begin
 			end
 			$killMode = arg
 		when '--cxinstalldir'
-			$cxPath = arg
-			if ! File.exists?($cxPath)
-				puts('The supplied --cxinstalldir "'+$cxPath+'" does not exist')
+			if ENV['_WWINE_SCRIPT'] == nil
+				puts('--cx-installdir is deprecated. Use "--wine '+arg+'" instead')
+			end
+			overrideCX = arg
+			if ! File.exists?(arg)
+				puts('The supplied --cxinstalldir "'+arg+'" does not exist')
 				exit(1)
 			end
 		when '--cxg-installdir'
-			$cxgPath = arg
-			if ! File.exists?($cxgPath)
-				puts('The supplied --cxg-installdir "'+$cxgPath+'" does not exist')
+			if ENV['_WWINE_SCRIPT'] == nil
+				puts('--cxg-installdir is deprecated. Use "--wine '+arg+'" instead')
+			end
+			overrideCXG = arg
+			if ! File.exists?(arg)
+				puts('The supplied --cxg-installdir "'+arg+'" does not exist')
 				exit(1)
 			end
 		when '--version'
@@ -1456,6 +1605,21 @@ begin
 		puts('--verbose assumed because the environment variable WWINE_VERBOSE is set to 1')
 		$verbosity = 1
 	end
+
+	if $wine != nil
+		resolvedWine = resolveWine($wine)
+		if resolvedWine == 'crossover' && overrideCX != nil
+			$wine = overrideCX
+		elsif resolvedWine == 'cxgames' && overrideCXG != nil
+			$wine = overrideCXG
+		end
+	end
+
+	# Default WINEARCH to win32 if we're not being launched by a script and not
+	# being run with --from
+	if $wineArch == nil && $wwineDataFrom == nil && ENV['__WWINE_SCRIPT'] == nil && $wine !~ /64$/
+		$wineArch = 'win32'
+	end
 rescue => ex
 	if opts.error?
 		puts('See --help for more inforation')
@@ -1472,8 +1636,8 @@ end
 if $killMode != nil
 	begin
 		killWine($killMode)
-	rescue
-		puts "Error while attempting to kill processes: "+$!
+	rescue => ex
+		handleException(ex)
 	end
 	exit(0)
 end

data/wwine.1

@@ -1,5 +1,5 @@
 .IX Title "WWINE 1"
-.TH WWINE 1 "2011-12-03" "wwine 0.2" ""
+.TH WWINE 1 "2018-04-21" "wwine 0.4" ""
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -8,11 +8,11 @@
 wwine \- a simple wine(1) wrapper
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
-wwine \fI(\s-1WWINE\s0 \s-1PARAMETERS\s0)\fR \fI\s-1PROGRAM\s0\fR \*(-- \fI[\s-1PROGRAM\s0 \s-1ARGUMENTS\s0]\fR
+wwine \fI(\s-1WWINE PARAMETERS\s0)\fR \fI\s-1PROGRAM\s0\fR \*(-- \fI[\s-1PROGRAM ARGUMENTS\s0]\fR
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
 \&\fBwwine\fR is a a \fIwine\fR\|(1) wrapper. It wraps various flavours of wine
-(including vanilla wine and crossover office/games) into a single
+(including vanilla wine and crossover) into a single
 unified interface, complete with full bottle support for all
 of them (including vanilla wine).
 .PP
@@ -35,28 +35,64 @@ Display the help screen
 .IX Item "-w, --wine FLAVOUR"
 Use the supplied flavour of wine. The default is to use vanilla wine.
 
-Possible parameters: wine, cxgames, cxoffice, cedega, cxg (alias for cxgames),
-cxo (alias for cxoffice) or /path/to/a/wine.binary
+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'.
 
-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 the first one found: wine, cxgames, cxoffice, cedega. To see the
+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
+the first one found: wine, crossover, cxoffice, cxgames, cedega. To see the
 default flavour wwine will use, run \fIwwine \-\-debuginfo\fR.
 
-See also \fI\-\-cxinstalldir\fR.
+If you supply a path to a crossover installation (or a cxgames installation),
+wwine will act as if \-\-wine is \*(L"crossover\*(R" (or cxgames), but use the Crossover
+installation at that path instead of its autodetected one. If you supply the
+path to a wine binary then it will use that as the \*(L"wine\*(R" command instead of
+the one in your \s-1PATH.\s0
 .IP "\fB\-b, \-\-bottle\fR \fI\s-1NAME\s0\fR" 4
 .IX Item "-b, --bottle NAME"
-Use the bottle with the name supplied. For cxgames, cxoffice or cedega
-it uses the flavours builtin bottle support. For vanilla wine it sets
-\&\s-1WINEPREFIX\s0 to use ~/.wwinebottles/<\s-1NAME\s0>. It defaults to no bottle,
-in which case vanilla wine will use ~/.wine, cxoffice/cxgames will
-use the bottle defined as default and for cedega a bottle named 'wwineFolder'
-will be used.
+Use the bottle with the name supplied. For crossover, cxgames, cxoffice or
+cedega it uses the flavours builtin bottle support. For vanilla wine it sets
+\&\s-1WINEPREFIX\s0 to use ~/.wwinebottles/<\s-1NAME\s0>. It defaults to no bottle, in which
+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.
+
+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.
+.IP "\fB\-\-arch\fR \fI\s-1ARCH\s0\fR" 4
+.IX Item "--arch ARCH"
+Set the wine architecture to use. Accepts win32 and win64. If \fI\-\-wine\fR ends
+with 64, then it defaults to win64, otherwise it defaults to win32. Usually you
+won't need to explicitly provied an \fI\-\-arch\fR since wwine will infer it from
+\&\fI\-\-wine\fR.
+.IP "\fB\-g, \-\-gamemode\fR" 4
+.IX Item "-g, --gamemode"
+Enables Feral Interactive's GameMode library, if it is installed. GameMode will
+enable certain performance features while the program is running, and then
+reset them once it exits. Can be used to get a bit of extra performance for
+games
+.IP "\fB\-\-no\-gamemode\fR" 4
+.IX Item "--no-gamemode"
+Disable GameMode if enabled.
+.IP "\fB\-l, \-\-list\fR" 4
+.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\-k, \-\-kill\fR" 4
 .IX Item "-k, --kill"
-Attempt to kill all running wine processes. See also \fI\-\-drykill\fR
+Attempt to kill running wine processes. See also \fI\-\-drykill\fR.
+
+By default it will kill all running wine processes. If you are on Linux then
+you can combine this option with the \fI\-\-bottle\fR and/or \fI\-\-wine\fR (or even
+\&\fI\-\-from\fR) options to limit it to killing only processes in a specific bottle
+and/or running under a specific wine.
 
-The default signal is \s-1SIGTERM\s0, however you can supply any signal number
+The default signal is \s-1SIGTERM,\s0 however you can supply any signal number
 you want (ie. \*(L"wwine \-k9\*(R").
 .IP "\fB\-\-drykill\fR" 4
 .IX Item "--drykill"
@@ -67,7 +103,7 @@ 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 cxgames/cxoffice/.. instead
+support, as well as support for using crossover/cxgames/cxoffice/.. instead
 of wine).
 
 When you use \-\-env, wwine will obey \-\-bottle and \-\-wine (or \-\-from) and set
@@ -77,14 +113,23 @@ have been set.
 
 See the \s-1EXAMPLES\s0 section for an example of how to use winetricks
 with cxgames using wwine's \fB\-\-env\fR
-.IP "\fB\-\-env\-bottle\fR" 4
-.IX Item "--env-bottle"
-This option is primarily for internal use. It causes wwine to parse which
-\&\-\-bottle to use from the \s-1WINEPREFIX\s0 variable.
-.IP "\fB\-c, \-\-cxinstalldir\fR \fI\s-1PATH\s0\fR" 4
-.IX Item "-c, --cxinstalldir PATH"
-Use the supplied path as the path to either a crossover office/games install
-directory, or as a directory that contains a cxoffice and/or cxgames directory.
+.IP "\fB\-\-tricks\fR" 4
+.IX Item "--tricks"
+Run winetricks with the wine/bottle combination supplied. This is \fIalmost\fR
+equivalent to \fI\-\-env winetricks \*(-- \-\-no\-isolate\fR (the \fI\-\-\fR would be required
+if you used \-\-env, and would stop processing the rest of the \fIwwine\fR command-line,
+\&\-\-tricks does not add the \-\-, so it can be supplied anywhere on the command-line)
+\&\fI\-\-tricks\fR can be used to quickly call winetricks in a bottle. Examples:
+.RS 4
+.IP "Install package (ie. corefonts)" 4
+.IX Item "Install package (ie. corefonts)"
+\&\fI\-\-tricks corefonts\fR
+.IP "Get winetricks help" 4
+.IX Item "Get winetricks help"
+\&\fI\-\-tricks \*(-- \-\-help\fR
+.RE
+.RS 4
+.RE
 .IP "\fB\-\-wrap\fR \fI\s-1PATH\s0\fR" 4
 .IX Item "--wrap PATH"
 Generate a wrapper script of the current command-line and write it to
@@ -123,7 +168,8 @@ applied.
 .IP "\fB\-v, \-\-verbose\fR" 4
 .IX Item "-v, --verbose"
 Increase verbosity. When this is present wwine will tell you the exact
-commands it is running.
+commands it is running. Supply multiple times to increase verbosity (ie.
+to enable wwine debugging output).
 .IP "\fB\-\-man\fR" 4
 .IX Item "--man"
 Show the manpage. Normally 'man wwine' would do, but when wwine is
@@ -145,14 +191,14 @@ Runs file.exe in wine, using the 'file' bottle.
 .IP "\fIwwine \-w cxg \-b file file.exe\fR" 4
 .IX Item "wwine -w cxg -b file file.exe"
 Runs file.exe in crossover games using the cxgames 'file' bottle
-.IP "\fIwwine \-\-cxinstalldir ~/cxgames7.0/ \-w cxg \-b file file.exe\fR" 4
-.IX Item "wwine --cxinstalldir ~/cxgames7.0/ -w cxg -b file file.exe"
+.IP "\fIwwine \-\-wine ~/cxgames7.0/ \-b file file.exe\fR" 4
+.IX Item "wwine --wine ~/cxgames7.0/ -b file file.exe"
 Runs file.exe in the version of crossover games that is installed at
 \&\fI~/cxgames7.0\fR, using the cxgames 'file' bottle.
 
-\&\-\-cxinstalldir can be useful to run something in a version of cxgames/cxoffice
-other than your primary one. Ie. if a regression causes it to not run in a
-later version.
+Providing a path to a Crossover installation to \-\-wine can be useful to run
+something in a version of cxgames/cxoffice other than your primary one. Ie. if
+a regression causes it to not run in a later version.
 .IP "\fIwwine \-w cxg \-b file file.exe \-\-wrap ~/bin/startFile\fR" 4
 .IX Item "wwine -w cxg -b file file.exe --wrap ~/bin/startFile"
 This causes wwine to create a wrapper shell script at ~/bin/startFile.
@@ -171,12 +217,15 @@ using the parameters specified in ~/bin/startFile, with the exception of
 \&\-\-wine, which would be wine instead of cxgames (here assuming this
 is the file created by the above example).
 .IP "\fIwwine \-w cxg \-b file \-\-env \*(-- winetricks \-\-no\-isolate vcrun6\fR" 4
-.IX Item "wwine -w cxg -b file --env  winetricks --no-isolate vcrun6"
-This causes wwine to set the environment variables \s-1WINE\s0 and \s-1WINEPREFIX\s0,
+.IX Item "wwine -w cxg -b file --env winetricks --no-isolate vcrun6"
+This causes wwine to set the environment variables \s-1WINE\s0 and \s-1WINEPREFIX,\s0
 and then execute the command supplied. In this case it would run
 winetricks, which would be told to install \*(L"vcrun6\*(R". Because it is running
 under wwine's \-\-env parameter, winetricks will use wwine to perform
 the actions, thus allowing you to use winetricks with cxgames.
+.IP "\fIwwine \-w cxg \-b file \-\-tricks vcrun6\fR" 4
+.IX Item "wwine -w cxg -b file --tricks vcrun6"
+This is the same as the above, but using wwine's builtin support for winetricks.
 .IP "\fIwwine \-k\fR" 4
 .IX Item "wwine -k"
 Will make wwine attempt to kill all running wine processes on this system by
@@ -185,9 +234,28 @@ sending them the \s-1TERM\s0 signal.
 .IX Item "wwine -k9"
 Will make wwine attempt to kill all running wine processes on this system by
 sending them the \s-1KILL\s0 signal. Should only be used if \*(L"wwine \-k\*(R" fails.
+.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".
+.SH "SUPPORTED WINE FLAVOURS"
+.IX Header "SUPPORTED WINE FLAVOURS"
+The following flavours of wine are supported:
+.IP "\fBWine\fR" 4
+.IX Item "Wine"
+Regular wine. <http://www.winehq.org/>
+.IP "\fBCrossover\fR and \fBCrossover Office/Games\fR" 4
+.IX Item "Crossover and Crossover Office/Games"
+The commercial Crossover release from Codeweavers, as well as the legacy
+versions \*(L"Crossover Office\*(R" and \*(L"Crossover Games\*(R". <http://www.codeweavers.com/>
+.IP "\fBPlayOnLinux\fR" 4
+.IX Item "PlayOnLinux"
+Wine packages installed via PlayOnLinux. <http://www.playonlinux.com/>
+.IP "\fBGameTree Linux/Cedega\fR" 4
+.IX Item "GameTree Linux/Cedega"
+The unmaintained Cedega flavour of wine.
 .SH "DEPENDENCIES"
 .IX Header "DEPENDENCIES"
-Requires at least one of wine, cxoffice, cxgames or cedega.
+Requires at least one of wine, crossover, cxoffice, cxgames or cedega.
 .SH "ENVIRONMENT VARIABLES"
 .IX Header "ENVIRONMENT VARIABLES"
 .IP "\fB\s-1WWINE_VERBOSE\s0\fR" 4
@@ -202,7 +270,7 @@ If this is not set, wwine will set it to \-all when using \-w wine.
 .IX Item "WINEPREFIX"
 wwine uses the \s-1WINEPREFIX\s0 environment variable to add bottle support when
 in \-w wine mode. If \s-1WINEPREFIX\s0 is set and a \-\-bottle is supplied, wwine will override
-the existing \s-1WINEPREFIX\s0. If no bottle is supplied, wwine will respect \s-1WINEPREFIX\s0.
+the existing \s-1WINEPREFIX.\s0 If no bottle is supplied, wwine will respect \s-1WINEPREFIX.\s0
 .PP
 Any environment variables that wwine sets while it is running will be output
 by wwine when in \-\-verbose mode.
@@ -221,4 +289,4 @@ submit feature requests there as well.
 Copyright (C) Eskild Hustvedt 2009, 2010, 2011
 .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\s0 \s-1FOR\s0 A \s-1PARTICULAR\s0 \s-1PURPOSE\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.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Eskild Hustvedt
 autorequire: 
-bindir: .
+bindir: "."
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2018-04-21 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
@@ -19,11 +19,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- wwine
-- README
+- "./wwine"
 - COPYING
+- README
+- wwine
 - wwine.1
-- ./wwine
 homepage: http://random.zerodogg.org/wwine
 licenses:
 - GPLv3
@@ -34,17 +34,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.10
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: wwine is a simple wine wrapper.