wwine 0.1.1.1 → 0.1.2

data/wwine

@@ -20,7 +20,7 @@ require 'getoptlong'
 # To read info for --debuginfo
 require 'open3'
 # Application version
-$version = '0.1.1'
+$version = '0.1.2'
 # The wine flavour to use
 $wine = nil
 # The bottle to use
@@ -66,6 +66,13 @@ def killWine (dryRun = false, signal = 15)
 	end
 	# Go through each line in the 'ps' output
 	wines.each do |line|
+		# True if we *require* /proc to be read for this process.
+		# This is for cases where, judging by the process name we shouldn't
+		# kill that process, but it's close enough to something we could kill
+		# that we want to check if /proc can provide a more definitive answer.
+		# (helps kill defunct processes)
+		requireProc = false
+
 		line.chomp!
 		# Ignore the header
 		if line =~ /USER\s*PID/
@@ -83,12 +90,12 @@ def killWine (dryRun = false, signal = 15)
 			next
 		end
 		# Ignore processes that are not wine-related
-		if name =~ /(wine|windows|[a-z]:\\|\.(exe|dll))/i
+		if name =~ /(wine|windows|[A-Za-z]:\\|\.(exe|dll))/i
 			# If wine is not a part of the process name, check if the
-			# name either includes a \ (which most likely means it is a windows
+			# name either includes a *:\ (which most likely means it is a windows
 			# path because it has already matched one of the above) or exe/dll.
-			if name !~ /wine/i && (name !~ /\// || name !~ /\.(exe|dll)/i)
-				next
+			if name !~ /wine/i && (name !~ /[A-Za-z]:\\/ || name !~ /\.(exe|dll)/i)
+				requireProc = true
 			end
 		else
 			next
@@ -106,9 +113,11 @@ def killWine (dryRun = false, signal = 15)
 		elsif File.readable?('/proc/'+pid+'/cmdline')
 			cmdline = IO.read('/proc/'+pid+'/cmdline')
 			cmdline.sub!(/\0.*/,'');
-			if cmdline !~ /\/[^\/]*wine[^\/]*$/i && cmdline !~ /^[A-Z]:\\[^\\]+\\/
+			if cmdline !~ /\/[^\/]*wine[^\/]*$/i && cmdline !~ /^[A-Za-z]:\\[^\\]+\\/
 				next
 			end
+		elsif requireProc
+			next
 		end
 		# Clean up the name
 		name.sub!(/\s*$/,'')
@@ -309,10 +318,23 @@ end
 # Purpose: Load wwine data from a wrapper script
 def loadWwineDataFromFile (file,dryRun = false)
 	begin
+		if !File.exists?(file)
+			puts file+': does not exist'
+			exit(1)
+		elsif ! File.readable?(file)
+			puts file+': is not readable'
+			exit(1)
+		end
 		puts 'Loading settings from '+file+':'
 		outFormat = '%-20s: %s'+"\n"
 		source = File.open(file)
 
+		if $wrapperPath
+			outMessage = ''
+		else
+			outMessage = 'Using '
+		end
+
 		wwineInfo = ''
 		wwineCmd = ''
 
@@ -352,10 +374,19 @@ def loadWwineDataFromFile (file,dryRun = false)
 			exit(0)
 		end
 
-		if info[1] != 'nil'
-			printf(outFormat,'Switching to directory',info[1])
+		if info[1] != 'nil' && !$wrapperCwd
+			if $wrapperPath
+				switchMessage = '--wrapdir'
+			else
+				switchMessage = 'Switching to directory'
+			end
+			printf(outFormat,switchMessage,info[1])
 			if File.exists?(info[1])
-				Dir.chdir(info[1])
+				if $wrapperPath
+					$wrapperCwd = info[1]
+				else
+					Dir.chdir(info[1])
+				end
 			else
 				puts info[1]+': does not exist, giving up.'
 				exit(0)
@@ -364,21 +395,26 @@ def loadWwineDataFromFile (file,dryRun = false)
 
 		if $wine == nil && info[2] != 'nil'
 			$wine = info[2]
-			printf(outFormat,'Using --wine',$wine)
+			printf(outFormat,outMessage+'--wine',$wine)
 		end
 
 		if $bottle == nil && info[3] != 'nil'
 			$bottle = info[3]
-			printf(outFormat,'Using --bottle',$bottle)
+			printf(outFormat,outMessage+'--bottle',$bottle)
 		end
 
 		if $cxPath == nil && info[4] != 'nil'
 			$cxPath = info[4]
-			printf(outFormat,'Using --cxinstalldir',$cxPath)
+			printf(outFormat,outMessage+'--cxinstalldir',$cxPath)
 		end
 
 		if ! dryRun
-			printf(outFormat,'Will now run',cmd.join(' '))
+			if $wrapperPath
+				out = 'Program command'
+			else
+				out = 'Will now run'
+			end
+			printf(outFormat,out,cmd.join(' '))
 			ARGV.unshift(*cmd)
 		end
 	rescue => ex
@@ -792,7 +828,7 @@ def getCXwithParams (wine,bottle, missingIsFatal = true)
 	# Create the bottle if it does not exist
 	if bottle != nil and ! File.exists?(ENV['HOME']+'/.'+wine+'/'+bottle)
 		puts 'The bottle '+bottle+' did not exist, creating...'
-		runcmd([ cxdir+'/bin/cxbottle', '--bottle',bottle,'--create'],'system')
+		runcmd([ cxdir+'/bin/cxbottle', '--bottle',bottle,'--create','--template','winxp'],'system')
 		if ! File.exists?(ENV['HOME']+'/.'+wine+'/'+bottle)
 			puts 'Bottle creation failed.'
 			exit 1

data/wwine.1

@@ -1,5 +1,5 @@
 .IX Title "WWINE 1"
-.TH WWINE 1 "2010-04-14" "wwine 0.1" ""
+.TH WWINE 1 "2010-07-07" "wwine 0.1.2" ""
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -92,7 +92,7 @@ were in at the time the wrapper script was created.
 Load parameters from the wwine wrapper script (as created by \fI\-\-wrap\fR)
 located at \fI\s-1PATH\s0\fR. wwine will act as though the wrapper script had been
 run, with one important difference, any additional command-line arguments
-supplied to wwine wil override settings from the wrapper script.
+supplied to wwine will override settings from the wrapper script.
 
 This can be useful if you have a wrapper script set up to use cxgames,
 but want to give a one off attempt at using wine. In such a case you could
@@ -113,8 +113,7 @@ directly on the wwine.1 file (and thus work even when 'man wwine'
 does not).
 .IP "\fB\-\-debuginfo\fR" 4
 .IX Item "--debuginfo"
-Output information that is useful for bug reports and to provide if you
-need support.
+Output information that is useful in bug reports, or when requesting support.
 .SH "EXAMPLES"
 .IX Header "EXAMPLES"
 .IP "\fIwwine file.exe\fR" 4

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wwine
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  - 1
-  version: 0.1.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Eskild Hustvedt
@@ -15,7 +15,7 @@ autorequire:
 bindir: .
 cert_chain: []
 
-date: 2010-06-12 00:00:00 +02:00
+date: 2010-08-22 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -32,6 +32,7 @@ files:
 - README
 - COPYING
 - wwine.1
+- ./wwine
 has_rdoc: true
 homepage: http://random.zerodogg.org/wwine
 licenses: []
@@ -42,23 +43,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: wwine is a simple wine wrapper.