wwine 0.2 → 0.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/wwine +8 -4
- metadata +2 -2
data/wwine
CHANGED
|
@@ -20,7 +20,7 @@ require 'getoptlong'
|
|
|
20
20
|
# To read info for --debuginfo
|
|
21
21
|
require 'open3'
|
|
22
22
|
# Application version
|
|
23
|
-
$version = '0.2'
|
|
23
|
+
$version = '0.2.1'
|
|
24
24
|
# The wine flavour to use
|
|
25
25
|
$wine = nil
|
|
26
26
|
# The bottle to use
|
|
@@ -877,15 +877,19 @@ def getCXwithParams (wine,bottle, missingIsFatal = true)
|
|
|
877
877
|
final = []
|
|
878
878
|
cxdir = nil
|
|
879
879
|
|
|
880
|
+
installName = wine
|
|
881
|
+
if wine == 'crossover'
|
|
882
|
+
installName = 'cxoffice'
|
|
883
|
+
end
|
|
880
884
|
mode = wine
|
|
881
885
|
bottleDir = '.'+wine
|
|
882
886
|
|
|
883
887
|
# Various crossover install paths
|
|
884
|
-
wines = ['/opt/'+
|
|
888
|
+
wines = ['/opt/'+installName, ENV['HOME']+'/'+installName, ENV['HOME']+'/.local/'+installName, ENV['HOME']+'/games/'+installName]
|
|
885
889
|
|
|
886
890
|
# If cxpath is set then overwrite the default paths
|
|
887
891
|
if $cxPath != nil
|
|
888
|
-
wines = [ $cxPath+'/'+
|
|
892
|
+
wines = [ $cxPath+'/'+installName, $cxPath ]
|
|
889
893
|
end
|
|
890
894
|
|
|
891
895
|
wines.each do |path|
|
|
@@ -1031,7 +1035,7 @@ def runWine (wine,bottle,args)
|
|
|
1031
1035
|
type = wine
|
|
1032
1036
|
|
|
1033
1037
|
if wine == 'cxgames' || wine == 'cxoffice' || wine == 'crossover'
|
|
1034
|
-
cmd = getCXwithParams(wine,bottle)
|
|
1038
|
+
cmd = getCXwithParams(wine,bottle,false)
|
|
1035
1039
|
if wine == 'cxgames' && cmd == nil
|
|
1036
1040
|
cmd = getCXwithParams('crossover',bottle)
|
|
1037
1041
|
if cmd != nil
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: wwine
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version:
|
|
4
|
+
version: 0.2.1
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: .
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2012-03-
|
|
12
|
+
date: 2012-03-12 00:00:00.000000000 Z
|
|
13
13
|
dependencies: []
|
|
14
14
|
description: wwine is a simple wine wrapper.
|
|
15
15
|
email: code at zerodogg dot org
|