wwine 0.6 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dc80c72bd69e1e4dfb94f59970ac9a0d13e33dae01aaf045e78bb3aa5d0b7b5
-  data.tar.gz: 7782fb91245eee5dc068c890326e538b8707a9cdedede3e3ae22e7b3236f3264
+  metadata.gz: c2323d7ed7648e49e680ce65ae04ee9e6363c6f9516bd7c8032bd4850cb9807f
+  data.tar.gz: 17356c8bdd57a12adf24089f875f6dd3aac574a3489208daa5890c60aa1aee1e
 SHA512:
-  metadata.gz: a69c8a650eb88a1815a3c6e08915a762036d85618b14a2eb82290396abe08d4cb9f50c60485f350e2191279933ba96b6e1b17722e043660021c7457cdf99f609
-  data.tar.gz: 31b4af75ed1a7fc8cd251271d78e4f6b3ed5ee2c76000c0570088c2f3d77345b888399c74b208e0ba56b736c989d4b0150825d00e3cde92ee51b2d5fb37d39fa
+  metadata.gz: 2d597a5c884adf20c67f6eb667ab88c19a0886aabf1c2b8d0a0b8b22a8244fa9997497ef19a670e7e37dda1c2751587bcadda87d278d8b4fa50128a78e9a9e05
+  data.tar.gz: dc868c092a9403199990a9c82500002a20925e2ee2a81b4d41881f56a0c6c47cc9d6a0c71be07d23bd233069ca6dda9a1161dee555cf1b6276bbe409f0f183f0

data/wwine

@@ -1,6 +1,6 @@
 #!/usr/bin/ruby
 # wwine
-# Copyright (C) Eskild Hustvedt 2009, 2010, 2011, 2012, 2013
+# Copyright (C) Eskild Hustvedt 2009-2013, 2016-2019
 #
 # 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
@@ -22,7 +22,7 @@ require 'open3'
 # Needed to make symlinks
 require 'fileutils'
 # Application version
-$version = '0.6'
+$version = '0.7'
 # The wine flavour to use
 $wine = nil
 # The bottle to use
@@ -312,19 +312,6 @@ def unShellQuote(target)
 	return fixedTarget
 end
 
-# Purpose: Unquote a full line of shellQuoted strings
-def unquoteShellArray (source,targetarr)
-	source.split(/ '/).each do |part|
-		part.sub!(/'$/,'')
-		part.sub!(/^'/,'')
-		part.chomp!
-		if part.match(/\S/)
-			targetarr.push(unShellQuote(part))
-		end
-	end
-	return targetarr
-end
-
 # Purpose: Write a wrapper script
 def writeWrapper (targetFile, wwineCommand, otherCommand, cwd, wwineInfo, args, wineprefix = nil)
 	# Open the file for writing
@@ -620,25 +607,18 @@ def loadWwineDataFromFile (file,dryRun = false)
 			puts "Unable to continue."
 			exit(0)
 		end
-		# 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'
+
+		info['Version'] = info['Info'].sub(/^\s*v(\d+)\s*.*/,'\1').to_i
+
+		if info['Version'] > 1 && info['Version'] <= 6
 			vputs(V_DBG,'File contains wwine metadata '+info['Info'])
-			info = parseWwineDataV2(info);
-		elsif info['Info'].match(/^v1/)
-			if ! $wrapperPath
-				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)
+			info = parseWwineData(info);
+		elsif info['Version'] == 1
+			puts "ERROR: Unsupported wwine metadata format (v1)"
+			puts ""
+			puts "This format is no longer supported. You will have to create a new wrapper script"
+			puts "using --wrap."
+			exit(1)
 		else
 			version = info['Info'].sub(/^(v\S+).+/,'\1').chomp
 			puts "This version of wwine supports info format v2, v3, v4, v5 and v6."
@@ -676,14 +656,17 @@ 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']
+			# Convert Cx*installdir to $wine if present in v2/v3 files
+			if info['Version'] < 4
+				# 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
 			end
 			printf(outFormat,outMessage+'--wine',$wine)
 		end
@@ -726,31 +709,8 @@ def loadWwineDataFromFile (file,dryRun = false)
 	end
 end
 
-# Parses wwine metadata version 1 (wwine 0.1.x)
-def parseWwineDataV1 (rawData)
-	data = []
-	unquoteShellArray(rawData['Info'],data)
-	info = Hash.new
-	info['Dir'] = data[1]
-	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)
-	info['Cmd'] = cmd
-	return info
-end
-
 # Parses wwine metadata version 2+ (wwine 0.2+)
-def parseWwineDataV2 (data)
+def parseWwineData (data)
 	cmd = []
 	currNo = 0
 	while currNo < 999
@@ -1348,6 +1308,8 @@ def getGameTreeWithParams (wine,bottle, missingIsFatal = true)
 	final = []
 	gametreeBin = nil
 
+	puts("WARNING: gametree/cedega support will be deprecated in wwine 0.8")
+
 	if inPath('gametree')
 		gametreeBin = 'gametree'
 	elsif inPath('gametree')
@@ -1505,7 +1467,7 @@ def getProtonWithParams(wine,bottle, missingIsFatal = true, multiReturn = false)
 
 	vputs(V_DBG,'Detected proton: '+command.join(' '))
 	if multiReturn
-		return command,bottleRoot+bottle
+		return command,bottle+'/pfx'
 	else
 		return command
 	end
@@ -1699,8 +1661,8 @@ def runWine (wine,bottle,args)
 				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')
+			puts('Must be one of the wine versions listed by `wwine --list` or the path to either a')
+			puts('wine executeable or a crossover installation directory')
 			exit(1)
 		end
 	end
@@ -1927,9 +1889,14 @@ begin
 		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$/
+	# Set a default WINEARCH to win32 unless:
+	# - one is already set with --arch
+	# - the wine version ends in 64
+	# - we're being launched by a script
+	# - we're running with --from
+	# - the wine is proton
+	if $wineArch == nil && $wwineDataFrom == nil && ENV['__WWINE_SCRIPT'] == nil && $wine !~ /64$/ && $wine !~ /^proton/
+		vputs(V_DBG,"Using a default (guessed) wineArch of win32")
 		$wineArch = 'win32'
 	end
 rescue => ex

data/wwine.1

@@ -1,5 +1,5 @@
 .IX Title "WWINE 1"
-.TH WWINE 1 "2018-11-12" "wwine 0.6" ""
+.TH WWINE 1 "2019-07-05" "wwine 0.7" ""
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -47,6 +47,9 @@ wwine will act as if \-\-wine is \*(L"crossover\*(R" (or cxgames), but use the C
 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
+
+Note that cedega support has been deprecated as of wwine 0.7 and will be
+removed in wwine 0.8.
 .IP "\fB\-b, \-\-bottle\fR \fI\s-1NAME\s0\fR" 4
 .IX Item "-b, --bottle NAME"
 Use the bottle with the name supplied. For crossover, cxgames, cxoffice or

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wwine
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
 platform: ruby
 authors:
 - Eskild Hustvedt
 autorequire: 
 bindir: "."
 cert_chain: []
-date: 2018-11-12 00:00:00.000000000 Z
+date: 2019-07-05 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
@@ -43,8 +43,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: wwine is a simple wine wrapper.