wwine 0.1 → 0.1.1.1

data/wwine

@@ -20,7 +20,7 @@ require 'getoptlong'
 # To read info for --debuginfo
 require 'open3'
 # Application version
-$version = 0.1
+$version = '0.1.1'
 # The wine flavour to use
 $wine = nil
 # The bottle to use
@@ -87,7 +87,7 @@ def killWine (dryRun = false, signal = 15)
 			# 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
 			# path because it has already matched one of the above) or exe/dll.
-			if ! name =~ /wine/i && ( name =~ /\// || ! name =~ /\.(exe|dll)/i )
+			if name !~ /wine/i && (name !~ /\// || name !~ /\.(exe|dll)/i)
 				next
 			end
 		else
@@ -95,9 +95,18 @@ def killWine (dryRun = false, signal = 15)
 		end
 		# At least on Linux kernels, /proc/ will include useful info, we use it to
 		# check if the exe actually is wine
-		if File.exists?('/proc/'+pid+'/exe') and File.symlink?('/proc/'+pid+'/exe')
+
+			# /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
+			if File.readlink('/proc/'+pid+'/exe') !~ /\/[^\/]*wine[^\/]*$/i
+				next
+			end
+			# /cmdline test (for when /exe isn't readable)
+		elsif File.readable?('/proc/'+pid+'/cmdline')
+			cmdline = IO.read('/proc/'+pid+'/cmdline')
+			cmdline.sub!(/\0.*/,'');
+			if cmdline !~ /\/[^\/]*wine[^\/]*$/i && cmdline !~ /^[A-Z]:\\[^\\]+\\/
 				next
 			end
 		end
@@ -210,7 +219,7 @@ def writeWrapper (targetFile, wwineCommand, otherCommand, cwd, wwineInfo, args,
 	end
 
 	file.puts('#!/bin/sh')
-	file.puts('# Script autogenerated by wwine '+$version.to_s+' (http://random.zerodogg.org/wwine)')
+	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')
 	file.puts('#')
 	file.puts('# You should have received a copy of the GNU General Public License')
@@ -332,7 +341,7 @@ def loadWwineDataFromFile (file,dryRun = false)
 
 		if info[0] != 'v1'
 			puts "This version of wwine only supports info format v1."
-			puts "This file is verison "+info[0]
+			puts "This file is version "+info[0]
 			puts "Unable to continue."
 			exit(0)
 		end
@@ -407,7 +416,7 @@ end
 
 # Purpose: Print the help output
 def Help ()
-	puts "wwine "+$version.to_s
+	puts "wwine "+$version
 	puts ""
 	puts "Usage: wwine (WWINE PARAMETERS) PROGRAM -- [PROGRAM ARGUMENTS]"
 	puts ""
@@ -581,7 +590,7 @@ end
 # Purpose: Print debugging info
 def debugInfo ()
 	outFormat = '%-20s: %s'+"\n"
-	puts "wwine "+$version.to_s
+	puts "wwine "+$version
 	# Load a --from file if it is set
 	if $wwineDataFrom
 		loadWwineDataFromFile($wwineDataFrom,true)
@@ -643,7 +652,7 @@ def handleException(ex)
 	puts()
 	puts('An exception has occurred and wwine can not continue.')
 	puts('This almost certainly reflects a bug in wwine.')
-	puts('Please check that you have the latest version off wwine,')
+	puts('Please check that you have the latest version of wwine,')
 	puts('and if you do, report this issue along with the text between the "---" above');
 	puts('to http://random.zerodogg.org/wwine/bugs')
 	exit(1)
@@ -931,7 +940,7 @@ begin
 		when '--cxinstalldir'
 			$cxPath = arg
 		when '--version'
-			puts('wwine version '+$version.to_s+' (for wine version info, run wwine --debuginfo)')
+			puts('wwine version '+$version+' (for wine version info, run wwine --debuginfo)')
 			exit(0)
 		when '--wrap'
 			$wrapperPath = arg

metadata

@@ -5,7 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  version: "0.1"
+  - 1
+  - 1
+  version: 0.1.1.1
 platform: ruby
 authors: 
 - Eskild Hustvedt
@@ -13,7 +15,7 @@ autorequire:
 bindir: .
 cert_chain: []
 
-date: 2010-04-14 00:00:00 +02:00
+date: 2010-06-12 00:00:00 +02:00
 default_executable: 
 dependencies: []