Skip to content

Fixed Uplay #978

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
merged 5 commits into from
Jun 6, 2019
Merged

Fixed Uplay #978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ddff16f
Fixed Uplay
Jun 5, 2019
4818ae2
Added fix in quickscript
Jun 6, 2019
50050b9
Syntax fix
Jun 6, 2019
fc2f539
Update script.js
ImperatorS79 Jun 6, 2019
590a247
Update script.js
ImperatorS79 Jun 6, 2019
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
9 changes: 8 additions & 1 deletion Applications/Games/Uplay/Online/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@
include("engines.wine.quick_script.online_installer_script");
include("engines.wine.plugins.windows_version");
include("engines.wine.verbs.corefonts");

var installerImplementation = {
run: function () {
new OnlineInstallerScript()
.name("Uplay")
.editor("Ubisoft")
.applicationHomepage("https://uplay.ubi.com/")
.author("Plata")
.author("Plata, KREYREN")
.url("https://ubistatic3-a.akamaihd.net/orbit/launcher_installer/UplayInstaller.exe")
.category("Games")
.executable("UbisoftGameLauncher.exe")
.wineVersion(LATEST_STAGING_VERSION)
.wineDistribution("staging")
.preInstall(function (wine/*, wizard*/) {
wine.corefonts();
wine.setOsForApplication().set("upc.exe", "winvista").do();
wine.setOsForApplication().set("UbisoftGameLauncher.exe", "winvista").do();
})
.go();
}
};
Expand Down
6 changes: 5 additions & 1 deletion Engines/Wine/QuickScript/Uplay Script/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ include("engines.wine.engine.object");
include("utils.functions.filesystem.extract");
include("utils.functions.filesystem.files");
include("engines.wine.verbs.luna");
include("engines.wine.verbs.corefonts");
include("engines.wine.plugins.windows_version");

function UplayScript() {
Expand Down Expand Up @@ -54,11 +55,14 @@ UplayScript.prototype.go = function () {
.prefix(this._name, this._wineDistribution, this._wineArchitecture, this._wineVersion)
.luna();

wine.corefonts();

setupWizard.message(tr("Please ensure that winbind is installed before you continue."));
setupWizard.wait(tr("Please follow the steps of the Uplay setup.\n\nUncheck \"Run Uplay\" or close Uplay completely after the setup so that the installation of \"{0}\" can continue.", this._name));
wine.run(tempFile, [], null, false, true);

wine.setOsForApplication().set("upc.exe", "winxp").do();
wine.setOsForApplication().set("upc.exe", "winvista").do();
wine.setOsForApplication().set("UbisoftGameLauncher.exe", "winvista").do();

// Uplay installation has finished
setupWizard.wait(tr("Please wait..."));
Expand Down