Commit 320a3425 authored by Vitaly Lipatov's avatar Vitaly Lipatov

just import winetricks-20181203.tar with rpmgs script

parent 42e63f98
......@@ -10,7 +10,7 @@
# Public License version 2.1 (or later), as published by the Free
# Software Foundation. Please see the file COPYING for details.
#
# Web Page: http://winetricks.org
# Web Page: https://github.com/Winetricks/winetricks
#
# Maintainers:
# Austin English <austinenglish!gmail.com>
......
# Winetricks
[![Build Status](https://travis-ci.org/Winetricks/winetricks.svg?branch=master)](https://travis-ci.org/Winetricks/winetricks) [![License](http://img.shields.io/:license-lgpl-green.svg)](https://tldrlegal.com/license/gnu-lesser-general-public-license-v2.1-(lgpl-2.1))
Homepage of Winetricks, previously hosted at <https://code.google.com/p/winetricks>.
Winetricks is an easy way to work around problems in Wine.
......@@ -12,36 +14,90 @@ Tagged releases are accessible here:
https://github.com/Winetricks/winetricks/releases
# Installing
The ```winetricks``` package should be used if it is available and up to date. The package is available in most distributions:
The ```winetricks``` package should be used if it is available and up to date. The package is available in most mainstream (Unix-like) Operating Systems:
* Arch: https://www.archlinux.org/packages/community/any/winetricks/
* Debian: https://packages.debian.org/sid/winetricks
* Fedora: https://fedoraproject.org/wiki/Wine#Packages
* FreeBSD: https://www.freebsd.org/cgi/ports.cgi?query=winetricks&stype=all
* Gentoo: https://packages.gentoo.org/packages/app-emulation/winetricks
* Homebrew (OSX): http://brewformulas.org/Winetricks
* MacPorts (OSX): https://www.macports.org/ports.php?by=name&substr=winetricks
* Slackbuilds (Slackware): http://slackbuilds.org/repository/14.2/system/winetricks/?search=winetricks
* Ubuntu: https://packages.ubuntu.com/search?keywords=winetricks Note: Ubuntu LTS versions are years out of date, a manual installation should be done instead.
* Ubuntu: https://packages.ubuntu.com/search?keywords=winetricks
Note: packaged Debian / Ubuntu winetricks versions are typically outdated, so a manual installation is recommended.
If the package is unavailable, outdated, or the latest version is desired, a manual installation of winetricks can be done. E.g.:
If the package is unavailable, outdated (e.g., Ubuntu LTSs), or the latest version is desired, a manual installation of winetricks can be done:
```
sudo -- sh -c '
cat > /usr/local/bin/update_winetricks.sh <<_EOF_SCRIPT
#!/bin/sh
cd "${HOME}" # change to a path writeable by current user
wget https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks
chmod +x winetricks
sudo mv winetricks /usr/local/bin
wget https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks.bash-completion
sudo mv winetricks.bash-completion /usr/share/bash-completion/completions/winetricks
_EOF_SCRIPT
chmod +x /usr/local/bin/update_winetricks.sh
'
```
curl can be used instead of wget:
To use ```curl``` instead of ```wget```: subsitute all ```wget``` calls with ```curl -O```, in the winetricks update script.
Note: the path ```/usr/local/bin``` must be in your ```PATH``` (env variable) for this to work.
# Updating
This winetricks update scripts can easily automated, via (where available) a systemd timer unit...
```
curl -O https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks
chmod +x winetricks
sudo mv winetricks /usr/local/bin
sudo -- sh -c '
cat > /etc/systemd/system/winetricks_update.timer <<_EOF_TIMER
[Unit]
Description=Run winetricks update script weekly (Saturday)
[Timer]
OnCalendar=Sat
Persistent=true
[Install]
WantedBy=timers.target
_EOF_TIMER
sudo cat > /etc/systemd/system/winetricks_update.service <<_EOF_SERVICE
[Unit]
Description=Run winetricks update script
After=network.target
[Service]
ExecStart=/usr/local/bin/update_winetricks.sh
Type=oneshot
_EOF_SERVICE
'
```
To start and enable the winetricks update timer:
```
sudo systemctl daemon-reload
sudo systemctl enable winetricks_update.timer
sudo systemctl start winetricks_update.timer
```
Or using the more tradional Unix crontab...
```
sudo cp "/usr/local/bin/update_winetricks.sh" "/etc/cron.weekly/"
```
Note: /usr/local/bin must be in your $PATH for this to work.
Winetricks can be updated by doing:
The core winetricks script can also be updated by simply doing:
```
winetricks --self-update
```
or:
```
sudo winetricks --self-update
```
for a system-wide winetricks installation.
# Custom .verb files
New dll/settings/programs can be added to Winetricks by passing a custom .verb (format below)
......
......@@ -9,7 +9,7 @@ Build-Depends: debhelper,
Package: winetricks
Section: contrib/otherosfs
Architecture: all
Homepage: https://winetricks.org
Homepage: https://github.com/Winetricks/winetricks
Depends: binutils,
cabextract,
p7zip,
......
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Source: http://winetricks.org
Source: https://github.com/Winetricks/winetricks
Vcs-Browser: https://github.com/Winetricks/winetricks/
Vcs-Git: git://github.com/winetricks/Winetricks.git
Vcs-Git: https://github.com/winetricks/Winetricks.git
Files: *
Copyright:
......
Using winetricks 20180815 - sha256sum: 9343f9174146c0fa4d34e18e05269ae772a45ba78e3d8786829fa21895f6f7f4 with wine-3.0.2 (Debian 3.0.2-1) and WINEARCH=win32
Using winetricks 20181203 - sha256sum: 2e32c987b5dd0ddd3e0836290d9561e7f251ca080248f53050cc84c27d4bbd18 with wine-3.19-116-gb78de971f6 and WINEARCH=win32
3m_library 3M Cloud Library (3M Company, 2015) [downloadable]
7zip 7-Zip 16.02 (Igor Pavlov, 2016) [downloadable]
abiword AbiWord 2.8.6 (AbiSource, 2010) [downloadable]
adobe_diged Adobe Digital Editions 1.7 (Adobe, 2011) [downloadable]
adobe_diged4 Adobe Digital Editions 4.5 (Adobe, 2015) [downloadable]
adobe_diged Adobe Digital Editions 1.7 (Adobe, 2011) [downloadable]
autohotkey AutoHotKey (autohotkey.org, 2010) [downloadable]
busybox BusyBox FRP-2121 (Ron Yorston / Busybox authors, 2015) [downloadable]
cmake CMake 2.8 (Kitware, 2013) [downloadable]
......@@ -15,6 +15,7 @@ ev3 Lego Mindstorms EV3 Home Edition (Lego, 2014) [download
firefox Firefox 51.0 (Mozilla, 2017) [downloadable]
fontxplorer Font Xplorer 1.2.2 (Moon Software, 2001) [downloadable]
foobar2000 foobar2000 v1.4 (Peter Pawlowski, 2018)
hhw HTML Help Workshop (Microsoft, 2000) [downloadable]
iceweasel GNU Icecat 31.7.0 (GNU Foundation, 2015) [downloadable]
irfanview Irfanview (Irfan Skiljan, 2016) [downloadable]
kde KDE on Windows (various, 2013) [downloadable]
......@@ -38,18 +39,18 @@ ollydbg201 OllyDbg (ollydbg.de, 2013) [downloadable]
openwatcom Open Watcom C/C++ compiler (can compile win16 code!) (Watcom, 2010) [downloadable]
protectionid Protection ID (CDKiLLER & TippeX, 2016)
psdk2003 MS Platform SDK 2003 (Microsoft, 2003) [downloadable]
psdkwin7 MS Windows 7 SDK (Microsoft, 2009) [downloadable]
psdkwin71 MS Windows 7.1 SDK (Microsoft, 2010) [downloadable]
qq QQ 8.9.1(Chinese chat app) (Tencent, 2017) [downloadable]
psdkwin7 MS Windows 7 SDK (Microsoft, 2009) [downloadable]
qqintl QQ International Instant Messenger 2.11 (Tencent, 2014) [downloadable]
qq QQ 8.9.1(Chinese chat app) (Tencent, 2017) [downloadable]
safari Safari (Apple, 2010) [downloadable]
sketchup SketchUp 8 (Google, 2012) [downloadable]
steam Steam (Valve, 2010) [downloadable]
uplay Uplay (Ubisoft, 2013) [downloadable]
utorrent µTorrent 2.2.1 (BitTorrent, 2011)
utorrent3 µTorrent 3.4 (BitTorrent, 2011) [downloadable]
vc2005express MS Visual C++ 2005 Express (Microsoft, 2005) [downloadable]
utorrent µTorrent 2.2.1 (BitTorrent, 2011)
vc2005expresssp1 MS Visual C++ 2005 Express SP1 (Microsoft, 2007) [downloadable]
vc2005express MS Visual C++ 2005 Express (Microsoft, 2005) [downloadable]
vc2005trial MS Visual C++ 2005 Trial (Microsoft, 2005) [downloadable]
vc2008express MS Visual C++ 2008 Express (Microsoft, 2008) [downloadable]
vc2010express MS Visual C++ 2010 Express (Microsoft, 2010) [downloadable]
......
Using winetricks 20180815 - sha256sum: 9343f9174146c0fa4d34e18e05269ae772a45ba78e3d8786829fa21895f6f7f4 with wine-3.0.2 (Debian 3.0.2-1) and WINEARCH=win32
Using winetricks 20181203 - sha256sum: 2e32c987b5dd0ddd3e0836290d9561e7f251ca080248f53050cc84c27d4bbd18 with wine-3.19-116-gb78de971f6 and WINEARCH=win32
3dmark03 3D Mark 03 (Futuremark, 2003)
3dmark05 3D Mark 05 (Futuremark, 2005) [downloadable]
3dmark06 3D Mark 06 (Futuremark, 2006)
......
Using winetricks 20180815 - sha256sum: 9343f9174146c0fa4d34e18e05269ae772a45ba78e3d8786829fa21895f6f7f4 with wine-3.0.2 (Debian 3.0.2-1) and WINEARCH=win32
Using winetricks 20181203 - sha256sum: 2e32c987b5dd0ddd3e0836290d9561e7f251ca080248f53050cc84c27d4bbd18 with wine-3.19-116-gb78de971f6 and WINEARCH=win32
3dmark05
3dmark2000
3dmark2001
......@@ -13,7 +13,9 @@ alienswarm_steam
allcodecs
allfonts
amstream
andale
aoe3_demo
arial
art2kmin
atmlib
autohotkey
......@@ -33,21 +35,22 @@ civ5_demo_steam
cjkfonts
cmake
cmd
cnc3_demo
cnc_tiberian_sun
colorprofile
comctl32
comctl32ocx
comdlg32ocx
comicsans
consolas
constantia
controlpad
controlspy
corbel
corefonts
courier
crayonphysics_demo
crypt32
d3dcompiler_43
d3dcompiler_47
d3drm
d3dx10
d3dx10_43
......@@ -109,6 +112,7 @@ dotnet452
dotnet46
dotnet461
dotnet462
dotnet472
dotnet_verifier
dpvoice
dragonage2_demo
......@@ -130,6 +134,15 @@ dxvk62
dxvk63
dxvk64
dxvk65
dxvk70
dxvk71
dxvk72
dxvk80
dxvk81
dxvk90
dxvk91
dxvk92
dxvk93
emu8086
esent
eufonts
......@@ -141,21 +154,25 @@ firefox
flash
fontxplorer
gdiplus
georgia
gfw
glidewrapper
glut
gmdls
hhw
hid
hon
hphbp_demo
iceweasel
icodecs
ie6
ie7
ie8
ie8_kb2936068
impact
ipamona
irfanview
itircl
itss
jet40
kde
kindle
......@@ -217,6 +234,7 @@ psdk2003
psdkwin7
psdkwin71
python26
qasf
qdvd
qedit
qq
......@@ -242,7 +260,9 @@ supermeatboy_steam
tabctl32
tahoma
takao
times
tmnationsforever
trebuchet
trine_demo_steam
trine_steam
uff
......@@ -271,11 +291,13 @@ vcrun2015
vcrun2017
vcrun6
vcrun6sp6
verdana
vjrun20
vlc
vlgothic
vulkanrt
vulkansdk
webdings
webio
wenquanyi
wglgears
......@@ -283,6 +305,7 @@ winamp
windowscodecs
winhttp
wininet
wininet_win2k
wme9
wmi
wmp10
......
Using winetricks 20180815 - sha256sum: 9343f9174146c0fa4d34e18e05269ae772a45ba78e3d8786829fa21895f6f7f4 with wine-3.0.2 (Debian 3.0.2-1) and WINEARCH=win32
Using winetricks 20181203 - sha256sum: 2e32c987b5dd0ddd3e0836290d9561e7f251ca080248f53050cc84c27d4bbd18 with wine-3.19-116-gb78de971f6 and WINEARCH=win32
acreedbro Assassin's Creed Brotherhood (Ubisoft, 2011)
algodoo_demo Algodoo Demo (Algoryx, 2009) [downloadable]
alienswarm_steam Alien Swarm (Steam) (Valve, 2010) [downloadable]
......@@ -8,8 +8,8 @@ atmosphir Atmosphir (Minor Studios, 2011)
avatar_demo James Camerons Avatar: The Game Demo (Ubisoft, 2009)
beneath_a_steel_sky_gog Beneath a Steel Sky (GOG.com, free) (Virgin Interactive, 1994)
bfbc2 Battlefield Bad Company 2 (EA, 2010)
bioshock2 Bioshock 2 (2K Games, 2010)
bioshock2_steam Bioshock 2 (Steam) (2k, 2010) [downloadable]
bioshock2 Bioshock 2 (2K Games, 2010)
bioshock_demo Bioshock Demo (2K Games, 2007) [downloadable]
blobby_volley Blobby Volley (Daniel Skoraszewsky, 2000)
borderlands_steam Borderlands (Steam, non-free) (2K Games, 2009) [downloadable]
......@@ -17,9 +17,7 @@ bttf101 Back to the Future Episode 1 (Telltale, 2011)
cim_demo Cities In Motion Demo (Paradox Interactive, 2010)
civ4_demo Civilization IV Demo (Firaxis Games, 2005)
civ5_demo_steam Civilization V Demo (Steam) (2K Games, 2010) [downloadable]
cnc3_demo Command & Conquer 3 Demo (EA, 2007) [downloadable]
cnc_redalert3_demo Command & Conquer Red Alert 3 Demo (EA, 2008)
cnc_tiberian_sun Command & Conquer: Tiberian Sun (2010 edition) (EA, 1999) [downloadable]
cod1 Call of Duty (Activision, 2003)
cod4mw_demo Call of Duty 4: Modern Warfare (Activision, 2007)
cod5_waw Call of Duty 5: World at War (Activision, 2008)
......@@ -30,31 +28,30 @@ csi6_demo CSI: Fatal Conspiracy Demo (Ubisoft, 2010)
darknesswithin2_demo Darkness Within 2 Demo (Zoetrope Interactive, 2010)
darkspore Darkspore (EA, 2011)
dcuo DC Universe Online (EA, 2011)
deadspace Dead Space (EA, 2008)
deadspace2 Dead Space 2 (EA, 2011)
deadspace Dead Space (EA, 2008)
demolition_company_demo Demolition Company demo (Giants Software, 2010)
deusex2_demo Deus Ex 2 / Deus Ex: Invisible War Demo (Eidos, 2003)
diablo2 Diablo II (Blizzard, 2000)
digitanks_demo Digitanks Demo (Lunar Workshop, 2011) [downloadable]
dirt2_demo Dirt 2 Demo (Codemasters, 2009)
dragonage Dragon Age: Origins (Bioware / EA, 2009)
dragonage2_demo Dragon Age II demo (EA/Bioware, 2011) [downloadable]
dragonage_ue Dragon Age: Origins - Ultimate Edition (Bioware / EA, 2010)
dragonage Dragon Age: Origins (Bioware / EA, 2009)
eve EVE Online Tyrannis (CCP Games, 2017) [downloadable]
fable_tlc Fable: The Lost Chapters (Microsoft, 2005)
fifa11_demo FIFA 11 Demo (EA Sports, 2010) [downloadable]
gta_vc Grand Theft Auto: Vice City (Rockstar, 2003)
hon Heroes of Newerth (S2 Games, 2018) [downloadable]
hordesoforcs2_demo Hordes of Orcs 2 Demo (Freeverse, 2010)
hphbp_demo Harry Potter and the Half-Blood Prince Demo (EA, 2009) [downloadable]
kotor1 Star Wars: Knights of the Old Republic (LucasArts, 2003)
lemonysnicket Lemony Snicket: A Series of Unfortunate Events (Activision, 2004)
lhp_demo LEGO Harry Potter Demo [Years 1-4] (Travellers Tales / WB, 2010)
losthorizon_demo Lost Horizon Demo (Deep Silver, 2010)
lswcs Lego Star Wars Complete Saga (Lucasarts, 2009)
luxor_ar Luxor Amun Rising (MumboJumbo, 2006)
masseffect2 Mass Effect 2 (DRM broken on Wine) (BioWare, 2010)
masseffect2_demo Mass Effect 2 (BioWare, 2010) [downloadable]
masseffect2 Mass Effect 2 (DRM broken on Wine) (BioWare, 2010)
maxmagicmarker_demo Max & the Magic Marker Demo (Press Play, 2010) [downloadable]
mdk MDK (3dfx) (Playmates International, 1997)
menofwar Men of War (Aspyr Media, 2009)
......@@ -73,17 +70,17 @@ sacrifice_gog Sacrifice (GOG.com) (Interplay, 2000)
sammax301_demo Sam & Max 301: The Penal Zone (Telltale Games, 2010)
sammax304_demo Sam & Max 304: Beyond the Alley of the Dolls (Telltale Games, 2010)
secondlife Second Life Viewer (Linden Labs, 2003-2011) [downloadable]
sims3 The Sims 3 (DRM broken on Wine) (EA, 2009)
sims3_gen The Sims 3: Generations (DRM broken on Wine) (EA, 2011)
sims3 The Sims 3 (DRM broken on Wine) (EA, 2009)
simsmed The Sims Medieval (DRM broken on Wine) (EA, 2011)
singularity Singularity (Activision, 2010)
splitsecond Split Second (Disney, 2010)
spore Spore (EA, 2008)
spore_cc_demo Spore Creature Creator trial (EA, 2008) [downloadable]
spore Spore (EA, 2008)
starcraft2_demo Starcraft II Demo (Blizzard, 2010)
supermeatboy_steam Super Meat Boy (Steam, non-free) (Independent, 2010) [downloadable]
the_witcher_2_gog The Witcher 2: Assassins of Kings (Atari, 2011)
theundergarden_demo The UnderGarden Demo (Atari, 2010)
the_witcher_2_gog The Witcher 2: Assassins of Kings (Atari, 2011)
tmnationsforever TrackMania Nations Forever (Nadeo, 2009) [downloadable]
torchlight Torchlight - boxed version (Runic Games, 2009)
trainztcc_2004 Trainz: The Complete Collection: TRS2004 (Paradox Interactive, 2008)
......
Using winetricks 20180815 - sha256sum: 9343f9174146c0fa4d34e18e05269ae772a45ba78e3d8786829fa21895f6f7f4 with wine-3.0.2 (Debian 3.0.2-1) and WINEARCH=win32
Using winetricks 20181203 - sha256sum: 2e32c987b5dd0ddd3e0836290d9561e7f251ca080248f53050cc84c27d4bbd18 with wine-3.19-116-gb78de971f6 and WINEARCH=win32
3dmark03
3dmark06
amnesia_tdd_demo
......
Using winetricks 20180815 - sha256sum: 9343f9174146c0fa4d34e18e05269ae772a45ba78e3d8786829fa21895f6f7f4 with wine-3.0.2 (Debian 3.0.2-1) and WINEARCH=win32
Using winetricks 20181203 - sha256sum: 2e32c987b5dd0ddd3e0836290d9561e7f251ca080248f53050cc84c27d4bbd18 with wine-3.19-116-gb78de971f6 and WINEARCH=win32
alldlls=builtin Override most common DLLs to builtin
alldlls=default Remove all DLL overrides
ao=disabled Disable AlwaysOffscreen (default)
......@@ -30,7 +30,7 @@ gsm=3 Set MaxShaderModelGS to 3
heapcheck Enable heap checking with GlobalFlag
hidewineexports=disable Disable hiding Wine exports from applications (wine-staging)
hidewineexports=enable Enable hiding Wine exports from applications (wine-staging)
hosts Add empty C:\windows\system32\driverstc\{hosts,services} files
hosts Add empty C:\windows\system32\drivers\etc\{hosts,services} files
isolate_home Remove wineprefix links to /home/austin
macdriver=mac Enable the Mac native Quartz driver (default)
macdriver=x11 Disable the Mac native Quartz driver, use X11 instead
......@@ -81,13 +81,13 @@ vsm=1 Set MaxShaderModelVS to 1
vsm=2 Set MaxShaderModelVS to 2
vsm=3 Set MaxShaderModelVS to 3
win10 Set Windows version to Windows 10
win2k Set Windows version to Windows 2000
win2k3 Set Windows version to Windows 2003
win2k8 Set Windows version to Windows 2008 R2
win2k Set Windows version to Windows 2000
win31 Set Windows version to Windows 3.1
win7 Set Windows version to Windows 7
win8 Set Windows version to Windows 8
win81 Set Windows version to Windows 8.1
win8 Set Windows version to Windows 8
win95 Set Windows version to Windows 95
win98 Set Windows version to Windows 98
windowmanagerdecorated=n Prevent the window manager from decorating windows
......
From https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=733511
With edited filename to make it easier to apply
diff --git a/checkbashisms b/checkbashisms
index 045328c..fe64a6b 100755
--- a/checkbashisms
+++ b/checkbashisms
@@ -644,7 +644,7 @@ sub init_hashes {
qr';;?&' => q<;;& and ;& special case operators>,
$LEADIN . qr'jobs\s' => q<jobs>,
# $LEADIN . qr'jobs\s+-[^lp]\s' => q<'jobs' with option other than -l or -p>,
- $LEADIN . qr'command\s+-[^p]\s' => q<'command' with option other than -p>,
+ $LEADIN . qr'command\s+-[^pvV]\s' => q<'command' with option other than -p/-v/-V>,
$LEADIN . qr'setvar\s' => q<setvar 'foo' 'bar' should be eval 'foo="'"$bar"'"'>,
$LEADIN . qr'trap\s+["\']?.*["\']?\s+.*(?:ERR|DEBUG|RETURN)' => q<trap with ERR|DEBUG|RETURN>,
$LEADIN . qr'(?:exit|return)\s+-\d' => q<exit|return with negative status code>,
--
2.6.2
.\" -*- nroff -*-
.TH WINETRICKS 1 "August 2018" "Winetricks 20180815" "Wine Package Manager"
.TH WINETRICKS 1 "December 2018" "Winetricks 20181203" "Wine Package Manager"
.SH NAME
winetricks \- manage virtual Windows environments using Wine
.SH SYNOPSIS
......@@ -162,13 +162,13 @@ See <https://www.gnu.org/licenses/>.
.SH BUGS
.PP
Bugs may be reported at
.I http://winetricks.org
.I https://github.com/Winetricks/winetricks
.PP
.SH AVAILABILITY
The most recent version of
.B winetricks
can be downloaded from
.I http://winetricks.org/download/releases/
.I https://github.com/Winetricks/winetricks/releases
.PP
The latest snapshot of the code may be obtained via git; see
.I https://github.com/Winetricks/winetricks/
......@@ -176,7 +176,7 @@ The latest snapshot of the code may be obtained via git; see
For further information about
.B winetricks
see
.I http://winetricks.org
.I https://github.com/Winetricks/winetricks/
.SH "SEE ALSO"
.BR wine (1)
#!/bin/bash
#
# BASH completion for the Winetricks package manager
#
#--------------------------------------------------------------------
# winetricks(1) completion -*- shell-script -*-
#
# Copyright:
# Copyright (C) 2018 Rob Walker <bob.mt.wya!gmail.com>
......
......@@ -63,9 +63,13 @@ command -v grep
_EOF
if ! "$checkbashisms" --posix "${temp}/test.sh"; then
echo "checkbashisms fails on command -v, using patch from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=733511 on a copy in ${temp} to work around"
echo "Use a sed expression, to add checkbashisms support for 'command -v', based on the patch from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=733511"
echo "Creating a copy of the checkbashisms script, in ${temp}, to workaround this issue"
# /usr/bin/ (or /usr/local/bin on OSX) isn't writable on Travis, so we have to patch it in /tmp and use that:
( cd "$(dirname "$checkbashisms")" && patch -p1 -o "${temp}/checkbashisms.patched" < "$OLDPWD/misc/checkbashisms-command-v.patch" && chmod +x "${temp}/checkbashisms.patched" )
(
sed -e '/qr'\''command\\s+\-\[\^p\]\\s'\''/ { ' -e 's|\[\^p\]|[^pvV]|' -e 's| \-p>| -p/-v/-V>|' -e '}' "$checkbashisms" > "${temp}/checkbashisms.patched" && \
chmod +x "${temp}/checkbashisms.patched"
)
checkbashisms="${temp}/checkbashisms.patched"
fi
......
......@@ -58,7 +58,7 @@ if [ "$1" = "check-deps" ] ; then
# Using an environmental variable rather than a CLI option
# so it doesn't need extra handling/targets in Makefile
elif [ ! -z "$WINETRICKS_ENABLE_KCOV" ] ; then
elif [ -n "$WINETRICKS_ENABLE_KCOV" ] ; then
KCOV_RESULTS="${outputdir}/kcov-results"
rm -rf "$KCOV_RESULTS"
mkdir -p "$KCOV_RESULTS"
......@@ -100,13 +100,6 @@ BLACKLIST="$BLACKLIST|bioshock2"
BLACKLIST="$BLACKLIST|xmllite"
# redundant metaverbs
BLACKLIST="$BLACKLIST|allcodecs"
# FIXME: (wine/winetricks bug?) usually hangs in winetricks-test:
BLACKLIST="$BLACKLIST|dotnet30sp1|dotnet35|dotnet35sp1|dotnet45"
# dotnet46 has endless critical section timeouts: https://bugs.winehq.org/show_bug.cgi?id=42470
# FIXME: test Dmitry's patch
BLACKLIST="$BLACKLIST|dotnet46"
# https://bugs.winehq.org/show_bug.cgi?id=40460
BLACKLIST="$BLACKLIST|dotnet20sp2|xna31"
# https://bugs.winehq.org/show_bug.cgi?id=16876
BLACKLIST="$BLACKLIST|wmi"
......@@ -372,18 +365,20 @@ test_command()
$XVFB $WINETRICKS --no-isolate -q nocrashdialog "$@"
return=$?
if [ "$return" = "32" ] && [ "$WINEARCH" != "win32" ]; then
skip "$command is not supported on $WINEARCH, requires win32"
archskip=1
elif [ "$return" = "64" ] && [ "$WINEARCH" != "win64" ]; then
skip "$command is not supported on $WINEARCH, requires win64"
archskip=1
fi
if [ "$EXPECT_FAIL" = "yes" ] ; then
# A success is failure:
if [ "$return" = "0" ] ; then
fail "$command succeeded, should have failed"
elif [ "$return" = "32" ] && [ "$WINEARCH" != "win32" ]; then
skip "$command is not supported on $WINEARCH, requires win32"
archskip=1
elif [ "$return" = "64" ] && [ "$WINEARCH" != "win64" ]; then
skip "$command is not supported on $WINEARCH, requires win64"
archskip=1
else
fail "test_command $command failed!"
pass "test_command $command expected to fail, and did fail!"
return
fi
else
......@@ -593,9 +588,10 @@ test_dlls()
test_dotnet()
{
# verify that each individual installer works:
# skipping dotnet30sp1/dotnet35/dotnet35sp1/dotnet45, known to hang (FIXME bug)
# dotnet20sp2: https://bugs.winehq.org/show_bug.cgi?id=40460
for x in dotnet11 dotnet11sp1 dotnet20 dotnet20sp1 dotnet30 dotnet40 dotnet46 dotnet461 dotnet462; do
for x in dotnet11 dotnet11sp1 \
dotnet20 dotnet20sp1 dotnet20sp2 \
dotnet30 dotnet30sp1 dotnet35 dotnet35sp1 \
dotnet40 dotnet45 dotnet452 dotnet46 dotnet461 dotnet462 dotnet472; do
echo "testing $x"
test_command --verify $x
done
......@@ -603,10 +599,9 @@ test_dotnet()
# FIXME: add other possible combinations
# combinations that should work:
# FIXME: dotnet20sp2: https://bugs.winehq.org/show_bug.cgi?id=40460
for combo in "dotnet20 dotnet20sp2"; do
# shellcheck disable=SC2086
EXPECT_FAIL=yes test_command --verify $combo
test_command --verify $combo
done
# combinations that should break:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment