wwine 0.2.2 → 0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e0c1328444909d1ab568f2290bc792a4ed4a790f
+  data.tar.gz: 07934726e9f51a60865e240a0edab85f3b850b6f
+SHA512:
+  metadata.gz: b6b535f272c338396857e9e619a258b3d668aacce073153b0ed0c06945e2b410f0e042bb79f92596ceeeb686a12dba384a2e87e4988d2388a3e511a7ad0dc51c
+  data.tar.gz: 9907eca8940177e1ff09500e2af83b06d91abcacbfecea8a3de0ed018ccd50026a2d8115f7fd63a2fff2e7bf2c49e5880afcc7ee802ccc333658678e908139a2

data/wwine

@@ -1,6 +1,6 @@
 #!/usr/bin/ruby
 # wwine
-# Copyright (C) Eskild Hustvedt 2009, 2010, 2011, 2012
+# Copyright (C) Eskild Hustvedt 2009, 2010, 2011, 2012, 2013
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,13 +20,15 @@ require 'getoptlong'
 # To read info for --debuginfo
 require 'open3'
 # Application version
-$version = '0.2.2'
+$version = '0.3'
 # 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
@@ -37,13 +39,21 @@ $wwineDataFrom = nil
 $envMode = false
 # true if we're in --tricks mode
 $tricksMode = false
+# A positive integer if we're in --kill or --drykill mode
+# (--drykill = 9999)
+$killMode = nil
 # Verbosity level
 $verbosity = 0
 V_INFO=1
 V_DBG=2
 
 # Purpose: Attempt to kill all running wine processes
-def killWine (dryRun = false, signal = 15)
+def killWine (signal)
+	dryRun = false
+	if signal == 9999
+		dryRun = true
+		signal = 15
+	end
 	# Open a pipe to ps to read processes
 	wines = IO.popen('ps uxw')
 	# True if we have killed something
@@ -70,6 +80,13 @@ def killWine (dryRun = false, signal = 15)
 	else
 		sigName = 'signal '+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')
 	# Go through each line in the 'ps' output
 	wines.each do |line|
 		# True if we *require* /proc to be read for this process.
@@ -111,7 +128,6 @@ def killWine (dryRun = false, signal = 15)
 
 			# /exe test
 		if File.readable?('/proc/'+pid+'/exe') and File.symlink?('/proc/'+pid+'/exe')
-			linkValue = File.readlink('/proc/'+pid+'/exe')
 			if File.readlink('/proc/'+pid+'/exe') !~ /\/[^\/]*wine[^\/]*$/i
 				next
 			end
@@ -127,16 +143,21 @@ def killWine (dryRun = false, signal = 15)
 		end
 		# Clean up the name
 		name.sub!(/\s*$/,'')
+		extra = getFromEnviron('/proc/'+pid+'/environ')
+		if $wine && resolveWine($wine) != extra['wine']
+			next
+		elsif $bottle && $bottle != extra['bottle']
+			next
+		end
+		# Output information
+		printf(format,extra['wine'],extra['bottle'],pid,name)
 		# Send SIGTERM (or output information if in dryRun mode)
 		if !dryRun
-			puts 'Sending '+sigName+' to '+name+' (PID '+pid+')'
 			begin
 				Process.kill(signal,pid.to_i)
 			rescue 
 				puts('Error while attempting to send signal to '+pid+': '+$!)
 			end
-		else
-			puts 'Would send '+sigName+' to '+name+' (PID '+pid+')'
 		end
 		killed = true
 	end
@@ -145,12 +166,50 @@ def killWine (dryRun = false, signal = 15)
 	end
 end
 
+# Purpose: Get information from /proc/PID/environ
+def getFromEnviron(path)
+	info = Hash.new
+	info['bottle'] = '(?)'
+	info['wine'] = '(?)'
+	if File.readable?(path)
+		source = File.open(path)
+		env = Hash.new
+		source.each("\0") do |entry|
+			key = entry.sub(/^([^=]+)=.*$/,'\1').chomp
+			value = entry.sub(/^[^=]+=(.*)$/,'\1').chomp
+			env[key] = value
+		end
+
+		if env['CX_BOTTLE']
+			info['bottle'] = env['CX_BOTTLE']
+		elsif env['WINEPREFIX']
+			info['bottle'] = env['WINEPREFIX'].sub(/^.*\/([^\/]+)$/,'\1').chomp
+		elsif env['__WWINE_INT_XBOTTLE']
+			info['bottle'] = env['__WWINE_INT_XBOTTLE']
+		else
+			info['bottle'] = '(default)'
+		end
+		if env['CX_ROOT'] && env['CX_ROOT'].match(/cxoffice/)
+			info['wine'] = 'crossover'
+		elsif env['CX_ROOT'] && env['CX_ROOT'].match(/cxgames/)
+			info['wine'] = 'cxgames'
+		elsif env['__WWINE_INT_XWINE']
+			info['wine'] = env['__WWINE_INT_XWINE']
+		elsif env['WINELOADER']
+			info['wine'] = 'wine'
+		end
+		info['wine'].sub!(/\0/,'')
+		info['bottle'].sub!(/\0/,'')
+	end
+	return info
+end
+
 # Purpose: Print formatted --help output
 # Usage: printHelp('-shortoption', '--longoption', 'description');
 #  Description will be reformatted to fit within a normal terminal
 def printHelp (short,long,description)
 	maxlen = 80
-	optionlen = 20
+	optionlen = 21
 	# 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
@@ -178,7 +237,7 @@ def printHelp (short,long,description)
 		raise("Option mismatch")
 	end
 	generatedDesc.split(/\n/).each do |descr|
-		printf("%-4s %-15s %s\n",short,long,descr)
+		printf("%-4s %-16s %s\n",short,long,descr)
 		short = ''; long = ''
 	end
 end
@@ -233,6 +292,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'
+	end
+
 	file.puts('#!/bin/sh')
 	file.puts('# Script autogenerated by wwine '+$version+' (http://random.zerodogg.org/wwine)')
 	file.puts('# Licensed under the GNU General Public License version 3 or later')
@@ -241,12 +307,11 @@ def writeWrapper (targetFile, wwineCommand, otherCommand, cwd, wwineInfo, args,
 	file.puts('# along with wwine. If not, see <http://www.gnu.org/licenses/>.')
 	file.puts('#')
 	file.puts('# -- Begin wwine metadata --')
-	file.puts('# wwineInfo: v2')
-	file.puts('# wwineDir: '+wwineInfo[0])
-	file.puts('# wwineWine: '+wwineInfo[1])
-	file.puts('# wwineBottle: '+wwineInfo[2])
-	file.puts('# wwineCxinstalldir: '+wwineInfo[3])
-	# wwineCmd isn't used in v2, but v1 outputs an invalid message if it
+	file.puts('# wwineInfo: '+metaFormat)
+	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')
 
@@ -264,6 +329,11 @@ 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.
+	file.puts("\t"+'export _WWINE_SCRIPT="$0"')
 	file.puts("\t"+'exec "$wwine" '+shellQuote(wwineCommand).join(" ")+' "$@"')
 	file.puts('else')
 	# Add wineprefix if needed. This is used when --wine is wine because wine
@@ -271,7 +341,19 @@ def writeWrapper (targetFile, wwineCommand, otherCommand, cwd, wwineInfo, args,
 	if wineprefix != nil
 		wineprefix.sub!(/'/,'\\')
 		file.puts("\t"+'export WINEPREFIX='+shellQuote(wineprefix))
-		file.puts("\t"+"export WINEDEBUG='-all'");
+	end
+	if wwineInfo['Wine'] =~ /^pol/i
+		path = getPOLwithParams(wwineInfo['Wine'].sub(/^pol[-:]?/i,''),nil,false,true)
+		if ENV['WINEDEBUG'] != nil
+			file.puts("\t"+"export WINEDEBUG="+shellQuote(ENV['WINEDEBUG']))
+		end
+		file.puts("\t"+'export WINESERVER='+shellQuote(path+'/bin/wineserver'))
+		file.puts("\t"+'export WINELOADER='+shellQuote(path+'/bin/wine'))
+		file.puts("\t"+'export WINEDLLPATH='+shellQuote(path+'/lib/wine'))
+	elsif wwineInfo['Wine'] == 'wine' || wineprefix
+		if ENV['WINEDEBUG'] != nil
+			file.puts("\t"+"export WINEDEBUG="+shellQuote(ENV['WINEDEBUG']))
+		end
 	end
 	file.puts("\t"+"exec "+shellQuote(otherCommand).join(" ")+' "$@"')
 	file.puts('fi')
@@ -287,7 +369,12 @@ end
 # Purpose: Generate a wwine command and wwineInfo array
 def generateWwineCmd (wine,bottle,wineCommand,type = nil)
 	wwineCmd = []
-	wwineInfo = ['nil','nil','nil','nil']
+	wwineInfo = {
+		'Cxinstalldir' => 'nil',
+		'Dir' => 'nil',
+		'Bottle' => 'nil',
+		'Wine' => 'nil'
+	}
 
 	# Generate a wwine command-line
 	if $verbosity > 0
@@ -295,15 +382,19 @@ def generateWwineCmd (wine,bottle,wineCommand,type = nil)
 	end
 	if $cxPath
 		wwineCmd.push('--cxinstalldir',$cxPath)
-		wwineInfo[3] = $cxPath
+		wwineInfo['Cxinstalldir'] = $cxPath
+	end
+	if $cxgPath
+		wwineCmd.push('--cxg-installdir',$cxgPath)
+		wwineInfo['CxGamesinstalldir'] = $cxgPath
 	end
 	if wine
 		wwineCmd.push('--wine',wine)
-		wwineInfo[1] = wine
+		wwineInfo['Wine'] = wine
 	end
 	if bottle
 		wwineCmd.push('--bottle',bottle)
-		wwineInfo[2] = bottle;
+		wwineInfo['Bottle'] = bottle;
 	end
 	return wwineCmd, wwineInfo
 end
@@ -330,13 +421,13 @@ def generateWrapper (wine,bottle,targetFile,wineCommand,args,type = nil)
 		$wrapperCwd = Dir.pwd
 	end
 
-	wwineInfo[0] = $wrapperCwd
+	wwineInfo['Dir'] = $wrapperCwd
 
 	wineprefix = 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'
+	if (type == 'wine' || type =~ /^pol[-:]/) && ENV['WINEPREFIX']
 		wineprefix = ENV['WINEPREFIX'].dup
 	end
 
@@ -349,14 +440,12 @@ def setEnvAndExec (wine,bottle,cmd,args,type)
 	if wine == nil
 		type,cmd = getAutoWithParams(bottle)
 	end
-	ENV['__WWINE_INT_WINE'] = wine
-	vputs(V_DBG,'Set __WWINE_INT_WINE='+wine)
+	envPut('_WWINE_INT_WINE',wine)
 
 	if wine == 'cxoffice' || wine == 'cxgames' || wine == 'crossover'
 		cxdir = getCXwithParams(wine,bottle,true,false,true)
 		if File.executable?(cxdir+'/bin/wineserver')
-			vputs(V_DBG,'Set WINESERVER='+cxdir+'/bin/wineserver')
-			ENV['WINESERVER'] = cxdir+'/bin/wineserver'
+			envPut('WINESERVER',cxdir+'/bin/wineserver')
 		end
 	end
 
@@ -364,31 +453,28 @@ def setEnvAndExec (wine,bottle,cmd,args,type)
 		puts("--env requires a --bottle")
 		exit(1)
 	end
-	vputs(V_DBG,'Set __WWINE_INT_BOTTLE='+bottle)
-	ENV['__WWINE_INT_BOTTLE'] = bottle
-	vputs(V_DBG,'Set __WWINE_INT_ENVMODE='+$version)
-	ENV['__WWINE_INT_ENVMODE'] = $version
+	envPut('__WWINE_INT_BOTTLE',bottle);
+	envPut('__WWINE_INT_ENVMODE',$version)
 	if $verbosity > 0
-		vputs(V_DBG,'Set __WWINE_INT_VERBOSITY='+$verbosity.to_s)
-		ENV['__WWINE_INT_VERBOSITY'] = $verbosity.to_s
+		envPut('__WWINE_INT_VERBOSITY',$verbosity.to_s)
 	end
 	if $cxPath
-		vputs(V_DBG,'Set __WWINE_INT_CXPATH='+$cxpath)
-		ENV['__WWINE_INT_CXPATH'] = $cxPath
+		envPut('__WWINE_INT_CXPATH',$cxPath);
+	end
+	if $cxgPath
+		envPut('__WWINE_INT_CXGPATH',$cxgPath);
 	end
 
 	if wine == 'wine' || File.exists?(wine)
 		bottlePath = ENV['WINEPREFIX']
-	elsif wine == 'cedega'
+	elsif resolveWine(wine) == 'gametree'
 		bottlePath = ENV['HOME']+'/.cedega/'+bottle
 	else
 		bottlePath = getCXwithParams(wine,bottle,true,true)
 	end
 
-	vputs(V_INFO,"Set WINEPREFIX="+bottlePath)
-	vputs(V_INFO,"Set WINE="+File.expand_path($0))
-	ENV['WINEPREFIX'] = bottlePath
-	ENV['WINE'] = File.expand_path($0)
+	envPut('WINEPREFIX',bottlePath)
+	envPut('WINE',File.expand_path($0))
 	if args.length > 0
 		puts("Executing "+args.join(' '))
 		exec *args
@@ -426,8 +512,9 @@ def loadWwineDataFromFile (file,dryRun = false)
 		end
 
 		info = Hash.new
-		wwineInfo = ''
-		wwineCmd = ''
+		# Default entries
+		info['CxGamesinstalldir'] = 'nil'
+		info['Cxinstalldir'] = 'nil'
 
 		source.each do |line|
 			if line.match(/^#\s+wwine/)
@@ -442,13 +529,22 @@ def loadWwineDataFromFile (file,dryRun = false)
 			puts "Unable to continue."
 			exit(0)
 		end
-		if info['Info'] == 'v2'
+		if info['Info'] == 'v2' || info['Info'] == 'v3'
 			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 ""
+			end
 		else
 			version = info['Info'].sub(/^(v\S+).+/,'\1').chomp
-			puts "This version of wwine supports info format v1 and v2."
+			puts "This version of wwine supports info format v1, v2 and v3."
 			puts "This file is version "+version
 			puts "Unable to continue."
 			exit(0)
@@ -497,9 +593,13 @@ def loadWwineDataFromFile (file,dryRun = false)
 			$cxPath = info['Cxinstalldir']
 			printf(outFormat,outMessage+'--cxinstalldir',$cxPath)
 		end
+		if $cxgPath == nil && info['CxGamesinstalldir'] != 'nil'
+			$cxgPath = info['CxGamesinstalldir']
+			printf(outFormat,outMessage+'--cxg-installdir',$cxgPath)
+		end
 
 		# Set the command to run
-		if ! dryRun && !$envMode
+		if ! dryRun && !$envMode && !$killMode
 			if $wrapperPath
 				out = 'Program command'
 			else
@@ -577,6 +677,12 @@ def vputs (level,str)
 	end
 end
 
+# Purpose: Set an environment variable
+def envPut (name,value)
+	vputs(V_DBG,'Set '+name+'='+value)
+	ENV[name] = value;
+end
+
 # Purpose: Print the help output
 def Help ()
 	puts "wwine "+$version
@@ -584,12 +690,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: wine, crossover, cxgames, cedega, or a path to a wine bin. Default: wine')
+	printHelp('-w','--wine','Select the wine to use. Any wine listed in "wwine --list" or the path to a wine binary.')
 	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('','--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('-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 CXoffice/CXgames (default: autodetect).')
+	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.')
@@ -658,10 +766,10 @@ def getWineVersion (source = 'wine', fromStderr = false, cmdOpt = '--version')
 end
 
 # Purpose: Get cedega version string
-def getCedegaVersionString ()
+def getGameTreeVersionString ()
 	cedegaVer = nil
 
-	if inPath('cedega')
+	if inPath('cedega') || inPath('gametree')
 		begin
 			# We need the HOME variable
 			if ENV.has_key?('HOME')
@@ -753,7 +861,7 @@ end
 
 # Purpose: Print debugging info
 def debugInfo ()
-	outFormat = '%-20s: %s'+"\n"
+	outFormat = '%-30s: %s'+"\n"
 	puts "wwine "+$version
 	# Load a --from file if it is set
 	if $wwineDataFrom
@@ -776,20 +884,37 @@ def debugInfo ()
 		printf(outFormat,'wwine md5sum','(exception: '+$!+')');
 	end
 
-	begin
+	listWines(true)
+	exit(0)
+end
 
+# Purpose: List available wine versions
+def listWines(debug = false)
+	outFormat = '%-30s: %s'+"\n"
+	begin
 		defaultWine,defaultWCMD = getAutoWithParams(nil,false)
+		if !debug
+			puts('Available wine versions:')
+		end
 		if defaultWine == nil
 			defaultWine = '(no wine found)'
 		end
-		printf(outFormat,'Default flavour',defaultWine)
+		if defaultWine != 'wine'
+			printf(outFormat,'(default wine)',defaultWine)
+		end
 
 		if inPath('wine')
 			wineVer = getWineVersion()
-		else
-			wineVer = '(not present)'
+			printf(outFormat,'wine',wineVer)
+			if defaultWine == 'wine'
+				puts "   (default when no --wine is specified)"
+			end
+		end
+
+		if $wine != nil and File.executable?($wine) and not File.directory?($wine)
+			otherWver = getWineVersion($wine)
+			printf(outFormat,'--wine',otherWver+' ('+$wine+')')
 		end
-		printf(outFormat,'Wine',wineVer)
 
 		cxgBin = getCXwithParams('cxgames',nil,false)
 		cxgVer = getCXVersionsFrom(cxgBin,true)
@@ -797,19 +922,33 @@ def debugInfo ()
 		cxoBin = getCXwithParams('cxoffice',nil,false)
 		cxoVer = getCXVersionsFrom(cxoBin,true)
 
-		if(cxoBin && !cxgBin)
-			cxgVer = '(not available - aliased to crossover)'
+		if (cxgBin || !cxoBin)
+			printf(outFormat,'cxgames',cxgVer)
+			puts "   (aliases for cxgames: cxg, cxgames)"
 		end
 
-		printf(outFormat,'Crossover Games',cxgVer)
-		printf(outFormat,'Crossover',cxoVer)
+		if cxoVer
+			printf(outFormat,'crossover',cxoVer)
+			if !cxgBin
+				puts "   (aliases for crossover: cx, cxo, cxg, cxoffice, cxgames)"
+			else
+				puts "   (aliases for crossover: cx, cxo, cxoffice)"
+			end
+		end
+
+		cedegaVer = getGameTreeVersionString()
+		if cedegaVer
+			printf(outFormat,'gametree',cedegaVer)
+			puts "   (aliases for gametree: cedega)"
+		end
 
-		cedegaVer = getCedegaVersionString()
-		printf(outFormat,'Cedega',cedegaVer)
+		Dir.glob(ENV['HOME']+'/.PlayOnLinux/wine/linux-*/*') do |dir|
+			name = dir.sub(/^.*\/([^\/]+)/,'\1')
+			printf(outFormat,'pol-'+name,getWineVersion(dir+'/bin/wine'))
+		end
 	rescue => ex
 		handleException(ex)
 	end
-	exit(0)
 end
 
 # Purpose: Handle an exception
@@ -828,12 +967,12 @@ def handleException(ex)
 end
 
 # Purpose: Get parameters for wine
-def getWineWithParams (wine,bottle, missingIsFatal = true)
+def getWineWithParams (wine,bottle, missingIsFatal = true, playOnLinux = false)
 	final = []
-	possibleWines = [ 'wine32','wine','wine64','wine.bin','wine.real' ]
+	possibleWines = [ 'wine32','wine','wine64','wine.bin','wine.real','wine-unstable','wine32-unstable' ]
 	# 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' ]
+	searchPath = [ '/usr/lib32/wine/','/usr/bin','/usr/lib/i386-linux-gnu/wine-unstable','/usr/lib/i386-linux-gnu/wine', ]
 	# If wine is not a path or does not exist, check for wine in the path
 	if !File.exists?(wine)
 		wine = nil
@@ -869,33 +1008,47 @@ def getWineWithParams (wine,bottle, missingIsFatal = true)
 	end
 	final.push(wine)
 
+	# wwine's bottle storage
+	wwine_bottleRoot = ENV['HOME']+'/.wwinebottles/'
+	# PlayOnLinux's bottle storage
+	playOnLinux_bottleRoot = ENV['HOME']+'/.PlayOnLinux/wineprefix/'
+	# wwine is the default
+	bottleRoot = wwine_bottleRoot
+	# If a POL bottle exists and we are using a POL wine, then use the
+	# POL bottle, otherwise use the wwine bottle
+	if playOnLinux && bottle != nil
+		if File.exists?(playOnLinux_bottleRoot+bottle)
+			bottleRoot = playOnLinux_bottleRoot
+			vputs(V_INFO,'Using the PlayOnLinux bottle path since a POL bottle named "'+bottle+'" exists')
+		else
+			vputs(V_DBG,'Using the wwine bottle location for POL since no POL bottle named "'+bottle+'" exists')
+		end
+	end
+
 	# Set WINEPREFIX for bottle support
 	if(bottle != nil && bottle.length > 0)
 		if ENV.has_key?('WINEPREFIX') && ENV['WINEPREFIX'].length > 0
 			warn 'WINEPREFIX= was already set, overriding it.'
 		end
 		if ! (bottle =~ /^\.?\//)
-			bottle = ENV['HOME']+'/.wwinebottles/'+bottle
-			if !File.exists?(ENV['HOME']+'/.wwinebottles/')
-				vputs(V_INFO,ENV['HOME']+'/.wwinebottles/: does not exist, creating')
-				vputs(V_DBG,ENV['HOME']+'/'+bottleDir+'/'+bottle+' did not exist')
+			bottle = bottleRoot+bottle
+			if !File.exists?(bottleRoot)
+				vputs(V_INFO,bottleRoot+': does not exist, creating')
 				begin
-					Dir.mkdir(ENV['HOME']+'/.wwinebottles/')
+					Dir.mkdir(bottleRoot)
 				rescue SystemCallError
-					puts('Failed to create directory "'+ENV['HOME']+'/.wwinebottles/'+": "+$!)
+					puts('Failed to create directory "'+bottleRoot+": "+$!)
 					puts('Unable to continue.')
 					exit(1)
 				end
 			end
 		end
-		ENV['WINEPREFIX'] = bottle
-		vputs(V_INFO,'Set WINEPREFIX='+bottle)
+		envPut('WINEPREFIX',bottle)
 	end
 
 	# Default to no debugging output if WINEDEBUG is not set yet
 	if ! ENV.has_key?('WINEDEBUG')
-		vputs(V_INFO,'Set WINEDEBUG=-all')
-		ENV['WINEDEBUG'] = '-all'
+		envPut('WINEDEBUG','-all')
 	end
 
 	vputs(V_DBG,'Detected wine: '+final.join(' '))
@@ -917,8 +1070,13 @@ def getCXwithParams (wine,bottle, missingIsFatal = true, getBottleDir = false, g
 	# Various crossover install paths
 	wines = ['/opt/'+installName, ENV['HOME']+'/'+installName, ENV['HOME']+'/.local/'+installName, ENV['HOME']+'/games/'+installName]
 
+	pathMode = nil
 	# If cxpath is set then overwrite the default paths
-	if $cxPath != nil
+	if wine == 'cxgames' && $cxgPath != nil
+		pathMode = $cxgPath
+		wines = [ $cxgPath+'/'+installName, $cxgPath ]
+	elsif $cxPath != nil
+		pathMode = $cxPath
 		wines = [ $cxPath+'/'+installName, $cxPath ]
 	end
 
@@ -940,10 +1098,10 @@ def getCXwithParams (wine,bottle, missingIsFatal = true, getBottleDir = false, g
 		end
 	end
 
-	# If we're using cxPath, perform some additional detection
-	if $cxPath != nil and mode != 'crossover'
-		if File.exists?($cxPath+'/etc/'+wine+'.conf')
-			cxdir = $cxPath
+	# If we're using $cx*Path, perform some additional detection
+	if pathMode != nil and mode != 'crossover'
+		if File.exists?(pathMode+'/etc/'+wine+'.conf')
+			cxdir = pathMode
 		else
 			cxdir = nil
 		end
@@ -955,22 +1113,28 @@ def getCXwithParams (wine,bottle, missingIsFatal = true, getBottleDir = false, g
 			vputs(V_DBG,'Failed to detect cxdir')
 			return nil
 		end
-		if $cxPath != nil
-			puts('Could not find a directory named "'+installName+'" in '+$cxPath)
-			puts('and '+$cxPath+' does not appear to be a '+installName+' install directory')
+		if pathMode != nil
+			puts('Could not find a directory named "'+installName+'" in '+pathMode)
+			puts('and '+pathMode+' does not appear to be a '+installName+' install directory')
 			if installName == 'cxgames'
 				reverse = 'cxoffice'
 			else
 				reverse = 'cxgames'
 			end
-			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?')
+			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('You could try to explicitly tell wwine where '+wine+' is installed')
-			puts('by supplying --cxinstalldir')
+			if wine == 'cxgames'
+				puts('by supplying --cxg-installdir')
+			else
+				puts('by supplying --cxinstalldir')
+			end
 		end
 		exit(1)
 	elsif getCXpath
@@ -1002,20 +1166,25 @@ def getCXwithParams (wine,bottle, missingIsFatal = true, getBottleDir = false, g
 	end
 end
 
-# Purpose: Get parameters for cedega
-def getCedegaWithParams (wine,bottle, missingIsFatal = true)
+# Purpose: Get parameters for gametree
+def getGameTreeWithParams (wine,bottle, missingIsFatal = true)
 	final = []
+	gametreeBin = nil
 
-	if not inPath('cedega')
+	if inPath('gametree')
+		gametreeBin = 'gametree'
+	elsif inPath('gametree')
+		gametreeBin = 'cedega'
+	else
 		if missingIsFatal
-			puts('cedega does not appear to be installed')
+			puts('gametree does not appear to be installed')
 			exit(1)
 		else
 			return nil
 		end
 	end
 
-	final.push('cedega','--install')
+	final.push(gametreeBin,'--install')
 
 	# Use wwineFolder as the folder if no bottle was supplied
 	if (bottle == nil || bottle.length == 0)
@@ -1023,10 +1192,44 @@ def getCedegaWithParams (wine,bottle, missingIsFatal = true)
 	end
 	final.push(bottle)
 
-	vputs(V_DBG,'Detected cedega: '+final.join(' '))
+	vputs(V_DBG,'Detected gametree: '+final.join(' '))
 	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' ]
+	detectedWine = nil
+	detectedWineDir = nil
+	winePaths.each do |path|
+		if File.exists?(path+'/'+wine+'/bin/wine')
+			detectedWine = path+'/'+wine+'/bin/wine'
+			detectedWineDir = path+'/'+wine
+		end
+	end
+
+	if returnDetected
+		return detectedWine
+	end
+
+	if not detectedWine
+		if !missingIsFatal
+			vputs(V_DBG,'Failed to locate wine '+wine)
+			return nil
+		end
+		puts('There does not appear to be a wine named "'+wine+'"')
+		puts('installed via PlayOnLinux. See "wwine --list" for a list of available wine versions.')
+		exit(1)
+	end
+
+	envPut('PATH',detectedWineDir+'/bin/:'+ENV['PATH'])
+	envPut('WINESERVER',detectedWineDir+'/bin/wineserver')
+	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)
+end
+
 # Purpose: Detect which wine to use and get parameters for that one
 # Returns: type,cmd
 def getAutoWithParams (bottle, missingIsFatal = true, returnFlavour = false)
@@ -1041,8 +1244,8 @@ def getAutoWithParams (bottle, missingIsFatal = true, returnFlavour = false)
 		type = 'cxoffice'
 	end
 	if cmd == nil
-		cmd = getCedegaWithParams('cedega',bottle,false)
-		type = 'cedega'
+		cmd = getGameTreeWithParams('gametree',bottle,false)
+		type = 'gametree'
 	end
 	if cmd == nil
 		if missingIsFatal
@@ -1067,12 +1270,7 @@ def runWine (wine,bottle,args)
 		wine = type
 	else
 		# Expand cx*
-		if wine == 'cxg'
-			wine = 'cxgames'
-		elsif wine == 'cxo' || wine == 'cx' || wine == 'cxoffice'
-			wine = 'crossover'
-		end
-
+		wine = resolveWine(wine)
 		type = wine
 
 		if wine == 'cxgames' || wine == 'cxoffice' || wine == 'crossover'
@@ -1090,8 +1288,11 @@ def runWine (wine,bottle,args)
 		elsif wine == 'wine' || File.executable?(wine)
 			type = 'wine'
 			cmd = getWineWithParams(wine,bottle)
-		elsif wine == 'cedega'
-			cmd = getCedegaWithParams(wine,bottle)
+		elsif resolveWine(wine) == 'gametree'
+			cmd = getGameTreeWithParams(wine,bottle)
+		elsif wine =~ /^pol[-:]?/i
+			realWine = wine.sub(/^pol[-:]?/i,'')
+			cmd = getPOLwithParams(realWine,bottle)
 		else
 			puts('Unknown --wine: '+wine)
 			puts('Must be one of: wine, crossover, cxgames, cedega, or the path to a wine executable')
@@ -1120,7 +1321,7 @@ def runWine (wine,bottle,args)
 			exit
 		# For cedega we just output an invalid version number in the same syntax
 		# as vanilla wine would have done
-		elsif wine == 'cedega'
+		elsif resolveWine(wine) == 'gametree'
 			puts 'wine-0.0.0'
 			exit
 		end
@@ -1134,6 +1335,11 @@ def runWine (wine,bottle,args)
 	elsif $wrapperPath != nil
 		generateWrapper(wine,bottle,$wrapperPath,cmd,args,type)
 	else
+		wine = resolveWine(wine)
+		envPut('__WWINE_INT_XWINE',wine);
+		if bottle
+			envPut('__WWINE_INT_XBOTTLE',bottle);
+		end
 		runcmd(cmd)
 	end
 end
@@ -1161,19 +1367,34 @@ else
 		[ '--kill', '-k', GetoptLong::OPTIONAL_ARGUMENT ],
 		[ '--drykill', GetoptLong::NO_ARGUMENT ],
 		[ '--cxinstalldir','-c',GetoptLong::REQUIRED_ARGUMENT ],
+		[ '--cxg-installdir','--cxgamesinstalldir','-C',GetoptLong::REQUIRED_ARGUMENT ],
 		[ '--version',GetoptLong::NO_ARGUMENT ],
 		[ '--wrap', GetoptLong::REQUIRED_ARGUMENT ],
 		[ '--wrapdir', GetoptLong::REQUIRED_ARGUMENT ],
 		[ '--debuginfo', GetoptLong::NO_ARGUMENT ],
+		[ '--list-wines','--list','-l', GetoptLong::NO_ARGUMENT ],
 		[ '--man', GetoptLong::NO_ARGUMENT ],
 		[ '--env', GetoptLong::NO_ARGUMENT ],
 		[ '--tricks', GetoptLong::NO_ARGUMENT ],
-		[ '--env-bottle', GetoptLong::NO_ARGUMENT ],
 		[ '--from', '-s', GetoptLong::REQUIRED_ARGUMENT ],
 		[ '--verbose', '-v', GetoptLong::NO_ARGUMENT ]
 	)
 end
 
+# Purpose: Resolve a wine to its proper name
+def resolveWine(wine)
+	map = Hash.new()
+	map['cx'] = 'crossover'
+	map['cxo'] = 'crossover'
+	map['cxoffice'] = 'crossover'
+	map['cxg'] = 'cxgames'
+	map['cedega'] = 'gametree'
+	if(map[wine])
+		wine = map[wine]
+	end
+	return wine
+end
+
 # Handle command-line arguments
 begin
 	opts.each do |opt, arg|
@@ -1185,35 +1406,32 @@ begin
 			$wine = arg
 		when '--bottle'
 			$bottle = arg
-		when '--env-bottle'
-			puts 'DEPRECATED: --env-bottle is deprecated as of wwine 0.2.2'
-			puts '            pending removal in 0.3'
-			if ENV['WINEPREFIX'] && ENV['WINEPREFIX'].length > 0
-				$bottle = File.basename(ENV['WINEPREFIX'])
-			else
-				puts 'wwine: --env-bottle supplied but WINEPREFIX is not set'
-				exit(1)
-			end
 		when '--verbose'
 			$verbosity = $verbosity+1
 		when '--drykill'
-			killWine(true)
-			exit(0)
+			$killMode = 9999
 		when '--debuginfo'
 			debugInfo()
+		when '--list-wines'
+			listWines()
+			exit(0)
 		when '--kill'
-			begin
-				killWine(false,arg)
-			rescue
-				puts "Error while attempting to kill processes: "+$!
+			if arg == nil
+				arg = 15
 			end
-			exit(0)
+			$killMode = arg
 		when '--cxinstalldir'
 			$cxPath = arg
 			if ! File.exists?($cxPath)
 				puts('The supplied --cxinstalldir "'+$cxPath+'" does not exist')
 				exit(1)
 			end
+		when '--cxg-installdir'
+			$cxgPath = arg
+			if ! File.exists?($cxgPath)
+				puts('The supplied --cxg-installdir "'+$cxgPath+'" does not exist')
+				exit(1)
+			end
 		when '--version'
 			puts('wwine version '+$version+' (for wine version info, run wwine --debuginfo)')
 			exit(0)
@@ -1238,8 +1456,12 @@ begin
 		puts('--verbose assumed because the environment variable WWINE_VERBOSE is set to 1')
 		$verbosity = 1
 	end
-rescue
-	puts('See --help for more inforation')
+rescue => ex
+	if opts.error?
+		puts('See --help for more inforation')
+	else
+		handleException(ex)
+	end
 	exit(1)
 end
 
@@ -1247,6 +1469,15 @@ if $wwineDataFrom
 	loadWwineDataFromFile($wwineDataFrom)
 end
 
+if $killMode != nil
+	begin
+		killWine($killMode)
+	rescue
+		puts "Error while attempting to kill processes: "+$!
+	end
+	exit(0)
+end
+
 if ARGV.length == 0 && !$envMode
 	Help()
 	exit(1)

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: wwine
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: '0.3'
 platform: ruby
 authors:
 - Eskild Hustvedt
 autorequire: 
 bindir: .
 cert_chain: []
-date: 2012-07-21 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies: []
-description: wwine is a simple wine wrapper.
+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
+  bottle support for all of them (including vanilla wine).
 email: code at zerodogg dot org
 executables:
 - wwine
@@ -24,27 +25,27 @@ files:
 - wwine.1
 - ./wwine
 homepage: http://random.zerodogg.org/wwine
-licenses: []
+licenses:
+- GPLv3
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: wwine is a simple wine wrapper.
 test_files: []