Skip to content

Do not install gecko/mono if no URL available #621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plata merged 1 commit into from
May 17, 2018
Merged

Do not install gecko/mono if no URL available #621

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 28 additions & 24 deletions Engines/Wine/Engine/Implementation/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,32 +95,36 @@ var engineImplementation = {
.extract();
},
_installGecko: function (setupWizard, winePackage, localDirectory) {
var gecko = new Resource()
.wizard(setupWizard)
.url(winePackage.geckoUrl)
.checksum(winePackage.geckoMd5)
.algorithm("md5")
.name(winePackage.geckoFile)
.directory("gecko")
.get();

var wineGeckoDir = localDirectory + "/share/wine/gecko";

lns(new java.io.File(gecko).getParent(), wineGeckoDir);
if (winePackage.geckoUrl) {
var gecko = new Resource()
.wizard(setupWizard)
.url(winePackage.geckoUrl)
.checksum(winePackage.geckoMd5)
.algorithm("md5")
.name(winePackage.geckoFile)
.directory("gecko")
.get();

var wineGeckoDir = localDirectory + "/share/wine/gecko";

lns(new java.io.File(gecko).getParent(), wineGeckoDir);
}
},
_installMono: function (setupWizard, winePackage, localDirectory) {
var mono = new Resource()
.wizard(setupWizard)
.url(winePackage.monoUrl)
.checksum(winePackage.monoMd5)
.algorithm("md5")
.name(winePackage.monoFile)
.directory("mono")
.get();

var wineMonoDir = localDirectory + "/share/wine/mono";

lns(new java.io.File(mono).getParent(), wineMonoDir);
if (winePackage.monoUrl) {
var mono = new Resource()
.wizard(setupWizard)
.url(winePackage.monoUrl)
.checksum(winePackage.monoMd5)
.algorithm("md5")
.name(winePackage.monoFile)
.directory("mono")
.get();

var wineMonoDir = localDirectory + "/share/wine/mono";

lns(new java.io.File(mono).getParent(), wineMonoDir);
}
},
delete: function (subCategory, version) {
if (this.isInstalled(subCategory, version)) {
Expand Down