Kalakoi/GDevelop
1
0
Fork 0
mirror of https://github.com/4ian/GDevelop.git synced 2025-10-15 10:19:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Search in more parents when downloading libGD.js

Browse Source
This commit is contained in:
Florian Rival
2019-06-06 00:23:03 +02:00
parent 1bb5a6614e
commit 3f7fe1d55d
1 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
newIDE/app/scripts/import-libGD.js
View File

@@ -36,15 +36,12 @@ if (shell.test('-f', sourceFile)) {
new Promise((resolve, reject) => {
shell.echo(`ℹ️ Trying to download libGD.js for ${gitRef}.`);
var hashShellString = shell.exec(`git rev-parse ${gitRef}`, {
var hashShellString = shell.exec(`git rev-parse "${gitRef}"`, {
silent: true,
});
if (hashShellString.stderr || hashShellString.code) {
shell.echo(
`❌ Can't find the hash of the associated commit. Are you using git to work on GDevelop?`
);
shell.echo(`ℹ️ Full error is: ${hashShellString.stderr}`);
shell.exit(1);
shell.echo(`⚠️ Can't find the hash of the associated commit.`);
reject();
return;
}
var hash = (hashShellString.stdout || 'unknown-hash').trim();
@@ -102,28 +99,41 @@ if (shell.test('-f', sourceFile)) {
};
// Try to download the latest libGD.js, fallback to previous or master ones
// if not found.
// if not found (including different parents, for handling of merge commits).
downloadLibGdJs('HEAD').then(onLibGdJsDownloaded, () =>
downloadLibGdJs('HEAD~1').then(onLibGdJsDownloaded, () =>
downloadLibGdJs('HEAD~2').then(onLibGdJsDownloaded, () =>
downloadLibGdJs('HEAD~3').then(onLibGdJsDownloaded, () =>
downloadLibGdJs('master').then(onLibGdJsDownloaded, () =>
downloadLibGdJs('master~1').then(onLibGdJsDownloaded, () =>
downloadLibGdJs('master~2').then(onLibGdJsDownloaded, () => {
if (alreadyHasLibGdJs) {
shell.echo(
`ℹ️ Can't download any version of libGD.js, assuming you can go ahead with the existing one.`
);
shell.exit(0);
return;
} else {
shell.echo(
`❌ Can't download any version of libGD.js, please check your internet connection.`
);
shell.exit(1);
return;
}
})
downloadLibGdJs('master^1').then(onLibGdJsDownloaded, () =>
downloadLibGdJs('master^2').then(onLibGdJsDownloaded, () =>
downloadLibGdJs('master^1^1').then(onLibGdJsDownloaded, () =>
downloadLibGdJs('master^1^2').then(onLibGdJsDownloaded, () =>
downloadLibGdJs('master^2^1').then(
onLibGdJsDownloaded,
() =>
downloadLibGdJs('master^2^2').then(
onLibGdJsDownloaded,
() => {
if (alreadyHasLibGdJs) {
shell.echo(
`ℹ️ Can't download any version of libGD.js, assuming you can go ahead with the existing one.`
);
shell.exit(0);
return;
} else {
shell.echo(
`❌ Can't download any version of libGD.js, please check your internet connection.`
);
shell.exit(1);
return;
}
}
)
)
)
)
)
)
)
)