Skip to content

Commit 41c27c3

Browse files
plataplata
authored
Fix ESLint "no-redeclare" warnings (#532)
1 parent 0a50096 commit 41c27c3

5 files changed

Lines changed: 27 additions & 25 deletions

File tree

‎Engines/Wine/QuickScript/InstallerScript/script.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ InstallerScript.prototype.go = function() {
4141

4242
var distributions = wine.availableDistributions();
4343
var shownDistributions = [];
44-
for (var i in distributions) {
45-
if (distributions[i] == "upstream") {
44+
for (var distributionIdx in distributions) {
45+
if (distributions[distributionIdx] == "upstream") {
4646
shownDistributions.push("upstream (recommended)");
4747
}
4848
else {
49-
shownDistributions.push(distributions[i]);
49+
shownDistributions.push(distributions[distributionIdx]);
5050
}
5151
}
5252
var selectedDistribution = setupWizard.menu(tr("Please select the wine distribution."), shownDistributions, "upstream (recommended)");
@@ -55,12 +55,12 @@ InstallerScript.prototype.go = function() {
5555

5656
var versions = wine.availableVersions();
5757
var shownVersions = [];
58-
for (var i in versions) {
59-
if (versions[i] == LATEST_STABLE_VERSION) {
60-
shownVersions.push(versions[i] + " (recommended)");
58+
for (var versionIdx in versions) {
59+
if (versions[versionIdx] == LATEST_STABLE_VERSION) {
60+
shownVersions.push(versions[versionIdx] + " (recommended)");
6161
}
6262
else {
63-
shownVersions.push(versions[i]);
63+
shownVersions.push(versions[versionIdx]);
6464
}
6565
}
6666
var selectedVersion = setupWizard.menu(tr("Please select the wine version."), shownVersions, LATEST_STABLE_VERSION + " (recommended)");

‎Engines/Wine/Verbs/d3dx10/script.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,28 +36,28 @@ Wine.prototype.d3dx10 = function () {
3636
.to(this.prefixDirectory + "/drive_c/d3dx10/")
3737
.extract(["-L", "-F", "*d3dx10*x86*"]);
3838

39-
var filesToExtract = [
39+
var filesToExtractx86 = [
4040
"apr2007_d3dx10_33_x86.cab", "aug2007_d3dx10_35_x86.cab", "aug2008_d3dx10_39_x86.cab",
4141
"aug2009_d3dx10_42_x86.cab", "dec2006_d3dx10_00_x86.cab", "jun2007_d3dx10_34_x86.cab",
4242
"jun2008_d3dx10_38_x86.cab", "jun2010_d3dx10_43_x86.cab", "mar2008_d3dx10_37_x86.cab",
4343
"mar2009_d3dx10_41_x86.cab", "nov2007_d3dx10_36_x86.cab", "nov2008_d3dx10_40_x86.cab"
4444
];
45-
extractDirectXtoSystemDirectory(progressBar, filesToExtract, that.system32directory(), "d3dx10*.dll");
45+
extractDirectXtoSystemDirectory(progressBar, filesToExtractx86, that.system32directory(), "d3dx10*.dll");
4646

4747
if (this.architecture() == "amd64") {
4848
new CabExtract()
4949
.archive(setupFile)
5050
.to(this.prefixDirectory + "/drive_c/d3dx10/")
5151
.extract(["-L", "-F", "*d3dx10*x64*"]);
5252

53-
var filesToExtract = [
53+
var filesToExtractx64 = [
5454
"apr2007_d3dx10_33_x64.cab", "aug2007_d3dx10_35_x64.cab", "aug2008_d3dx10_39_x64.cab",
5555
"aug2009_d3dx10_42_x64.cab", "dec2006_d3dx10_00_x64.cab", "jun2007_d3dx10_34_x64.cab",
5656
"jun2008_d3dx10_38_x64.cab", "jun2010_d3dx10_43_x64.cab", "mar2008_d3dx10_37_x64.cab",
5757
"mar2009_d3dx10_41_x64.cab", "nov2007_d3dx10_36_x64.cab", "nov2008_d3dx10_40_x64.cab"
5858
];
5959

60-
extractDirectXtoSystemDirectory(progressBar, filesToExtract, that.system64directory(), "d3dx10*.dll");
60+
extractDirectXtoSystemDirectory(progressBar, filesToExtractx64, that.system64directory(), "d3dx10*.dll");
6161
}
6262

6363
this.overrideDLL()

‎Engines/Wine/Verbs/d3dx9/script.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Wine.prototype.d3dx9 = function () {
3636
.to(this.prefixDirectory + "/drive_c/d3dx9/")
3737
.extract(["-L", "-F", "*d3dx9*x86*"]);
3838

39-
var filesToExtract = [
39+
var filesToExtractx86 = [
4040
"apr2007_d3dx9_33_x86.cab", "aug2007_d3dx9_35_x86.cab", "apr2005_d3dx9_25_x86.cab",
4141
"apr2006_d3dx9_30_x86.cab", "aug2005_d3dx9_27_x86.cab", "aug2008_d3dx9_39_x86.cab",
4242
"aug2009_d3dx9_42_x86.cab", "dec2006_d3dx9_32_x86.cab", "dec2005_d3dx9_28_x86.cab",
@@ -45,15 +45,15 @@ Wine.prototype.d3dx9 = function () {
4545
"mar2008_d3dx9_37_x86.cab", "mar2009_d3dx9_41_x86.cab", "nov2007_d3dx9_36_x86.cab",
4646
"nov2008_d3dx9_40_x86.cab", "oct2006_d3dx9_31_x86.cab"
4747
];
48-
extractDirectXtoSystemDirectory(progressBar, filesToExtract, that.system32directory(), "d3dx9*.dll");
48+
extractDirectXtoSystemDirectory(progressBar, filesToExtractx86, that.system32directory(), "d3dx9*.dll");
4949

5050
if (this.architecture() == "amd64") {
5151
new CabExtract()
5252
.archive(setupFile)
5353
.to(this.prefixDirectory + "/drive_c/d3dx9/")
5454
.extract(["-L", "-F", "*d3dx9*x64*"]);
5555

56-
var filesToExtract = [
56+
var filesToExtractx64 = [
5757
"APR2007_d3dx9_33_x64.cab", "AUG2007_d3dx9_35_x64.cab", "Apr2005_d3dx9_25_x64.cab",
5858
"Apr2006_d3dx9_30_x64.cab", "Aug2005_d3dx9_27_x64.cab", "Aug2008_d3dx9_39_x64.cab",
5959
"Aug2009_d3dx9_42_x64.cab", "DEC2006_d3dx9_32_x64.cab", "Dec2005_d3dx9_28_x64.cab",
@@ -63,7 +63,7 @@ Wine.prototype.d3dx9 = function () {
6363
"Nov2008_d3dx9_40_x64.cab", "OCT2006_d3dx9_31_x64.cab"
6464
];
6565

66-
extractDirectXtoSystemDirectory(progressBar, filesToExtract, that.system64directory(), "d3dx9*.dll");
66+
extractDirectXtoSystemDirectory(progressBar, filesToExtractx64, that.system64directory(), "d3dx9*.dll");
6767
}
6868

6969
this.overrideDLL()

‎Engines/Wine/Verbs/secur32/script.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ include(["Utils", "Functions", "Filesystem", "Files"]);
88
* @returns {Wine}
99
*/
1010
Wine.prototype.secur32 = function() {
11-
var setupFile = new Resource()
11+
var setupFilex86 = new Resource()
1212
.wizard(this._wizard)
1313
.url("https://download.microsoft.com/download/0/A/F/0AFB5316-3062-494A-AB78-7FB0D4461357/windows6.1-KB976932-X86.exe")
1414
.checksum("c3516bc5c9e69fee6d9ac4f981f5b95977a8a2fa")
1515
.name("windows6.1-KB976932-X86.exe")
1616
.get();
1717

1818
new CabExtract()
19-
.archive(setupFile)
19+
.archive(setupFilex86)
2020
.wizard(this._wizard)
2121
.to(this.prefixDirectory + "/TMP/")
2222
.extract(["-L", "-F", "x86_microsoft-windows-lsa_31bf3856ad364e35_6.1.7601.17514_none_a851f4adbb0d5141/secur32.dll"]);
@@ -26,15 +26,15 @@ Wine.prototype.secur32 = function() {
2626
remove(this.prefixDirectory + "/TMP/");
2727

2828
if (this.architecture() == "amd64") {
29-
var setupFile = new Resource()
29+
var setupFilex64 = new Resource()
3030
.wizard(this._wizard)
3131
.url("https://download.microsoft.com/download/0/A/F/0AFB5316-3062-494A-AB78-7FB0D4461357/windows6.1-KB976932-X64.exe")
3232
.checksum("74865ef2562006e51d7f9333b4a8d45b7a749dab")
3333
.name("windows6.1-KB976932-X64.exe")
3434
.get();
3535

3636
new CabExtract()
37-
.archive(setupFile)
37+
.archive(setupFilex64)
3838
.wizard(this._wizard)
3939
.to(this.prefixDirectory + "/TMP/")
4040
.extract(["-L", "-F", "amd64_microsoft-windows-lsa_31bf3856ad364e35_6.1.7601.17514_none_04709031736ac277/secur32.dll"]);

‎Engines/Wine/Verbs/xact/script.js‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,15 @@ Wine.prototype.xact = function () {
5151
progressBar.setText(tr("Extracting {0} ...", "Xact"));
5252
progressBar.setProgressPercentage(0.);
5353

54+
var filesToExtract = []
55+
5456
//---------------------------------------------------------Extract xactengine*.dll--------------------------------------------
5557
new CabExtract()
5658
.archive(setupFile)
5759
.to(this.prefixDirectory + "/drive_c/xact_x86/")
5860
.extract(["-L", "-F", "*_xact_*x86*"]);
5961

60-
var filesToExtract = [
62+
filesToExtract = [
6163
"apr2006_xact_x86.cab", "apr2007_xact_x86.cab", "aug2006_xact_x86.cab",
6264
"aug2007_xact_x86.cab", "aug2008_xact_x86.cab", "aug2009_xact_x86.cab",
6365
"dec2006_xact_x86.cab", "fev2006_xact_x86.cab", "fev2007_xact_x86.cab",
@@ -75,7 +77,7 @@ Wine.prototype.xact = function () {
7577
.to(this.prefixDirectory + "/drive_c/x3daudio_x86/")
7678
.extract(["-L", "-F", "*_x3daudio_*x86*"]);
7779

78-
var filesToExtract = [
80+
filesToExtract = [
7981
"feb2010_x3daudio_x86.cab", "jun2008_x3daudio_x86.cab", "mar2008_x3daudio_x86.cab",
8082
"mar2009_x3daudio_x86.cab", "nov2007_x3daudio_x86.cab", "nov2008_x3daudio_x86.cab"
8183
];
@@ -88,7 +90,7 @@ Wine.prototype.xact = function () {
8890
.to(this.prefixDirectory + "/drive_c/xaudio_x86/")
8991
.extract(["-L", "-F", "*_xaudio_*x86*"]);
9092

91-
var filesToExtract = [
93+
filesToExtract = [
9294
"aug2008_xaudio_x86.cab", "aug2009_xaudio_x86.cab", "feb2010_xaudio_x86.cab",
9395
"jun2008_xaudio_x86.cab", "jun2010_xaudio_x86.cab", "mar2008_xaudio_x86.cab",
9496
"mar2009_xaudio_x86.cab", "nov2008_xaudio_x86.cab"
@@ -124,7 +126,7 @@ Wine.prototype.xact = function () {
124126
.to(this.prefixDirectory + "/drive_c/xact_x64/")
125127
.extract(["-L", "-F", "*_xact_*x64*"]);
126128

127-
var filesToExtract = [
129+
filesToExtract = [
128130
"apr2006_xact_x64.cab", "apr2007_xact_x64.cab", "aug2006_xact_x64.cab",
129131
"aug2007_xact_x64.cab", "aug2008_xact_x64.cab", "aug2009_xact_x64.cab",
130132
"dec2006_xact_x64.cab", "fev2006_xact_x64.cab", "fev2007_xact_x64.cab",
@@ -142,7 +144,7 @@ Wine.prototype.xact = function () {
142144
.to(this.prefixDirectory + "/drive_c/x3daudio_x64/")
143145
.extract(["-L", "-F", "*_x3daudio_*x64*"]);
144146

145-
var filesToExtract = [
147+
filesToExtract = [
146148
"feb2010_x3daudio_x64.cab", "jun2008_x3daudio_x64.cab", "mar2008_x3daudio_x64.cab",
147149
"mar2009_x3daudio_x64.cab", "nov2007_x3daudio_x64.cab", "nov2008_x3daudio_x64.cab"
148150
];
@@ -155,7 +157,7 @@ Wine.prototype.xact = function () {
155157
.to(this.prefixDirectory + "/drive_c/xaudio_x64/")
156158
.extract(["-L", "-F", "*_xaudio_*64*"]);
157159

158-
var filesToExtract = [
160+
filesToExtract = [
159161
"aug2008_xaudio_x64.cab", "aug2009_xaudio_x64.cab", "feb2010_xaudio_x64.cab",
160162
"jun2008_xaudio_x64.cab", "jun2010_xaudio_x64.cab", "mar2008_xaudio_x64.cab",
161163
"mar2009_xaudio_x64.cab", "nov2008_xaudio_x64.cab"

0 commit comments

Comments
 (0)