actions
/
unity-builder
mirror of https://github.com/game-ci/unity-builder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix unity path (#552) 

* Fix unity path

* Add quotes back
pull/544/head
VioletXF 2023-07-28 05:15:13 +09:00 committed by GitHub
parent 21da302529
commit f43335663c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist/.DS_Store vendored 100644
View File

Binary file not shown.

11
dist/index.js generated vendored
View File

@ -6996,10 +6996,10 @@ const node_fs_1 = __importDefault(__nccwpck_require__(87561));
class SetupMac { class SetupMac {
static async setup(buildParameters, actionFolder) { static async setup(buildParameters, actionFolder) {
const unityEditorPath = `/Applications/Unity/Hub/Editor/${buildParameters.editorVersion}/Unity.app/Contents/MacOS/Unity`; const unityEditorPath = `/Applications/Unity/Hub/Editor/${buildParameters.editorVersion}/Unity.app/Contents/MacOS/Unity`;
if (!node_fs_1.default.existsSync(this.unityHubExecPath)) { if (!node_fs_1.default.existsSync(this.unityHubExecPath.replace(/"/g, ''))) {
await SetupMac.installUnityHub(buildParameters); await SetupMac.installUnityHub(buildParameters);
} }
if (!node_fs_1.default.existsSync(unityEditorPath)) { if (!node_fs_1.default.existsSync(unityEditorPath.replace(/"/g, ''))) {
await SetupMac.installUnity(buildParameters); await SetupMac.installUnity(buildParameters);
} }
await SetupMac.setEnvironmentVariables(buildParameters, actionFolder); await SetupMac.setEnvironmentVariables(buildParameters, actionFolder);
@ -7087,10 +7087,9 @@ class SetupMac {
...moduleArguments, ...moduleArguments,
'--childModules', '--childModules',
]; ];
const escapedExecPath = this.unityHubExecPath.replace(/ /g, '\\ ');
// Ignoring return code because the log seems to overflow the internal buffer which triggers // Ignoring return code because the log seems to overflow the internal buffer which triggers
// a false error // a false error
const errorCode = await exec_1.exec(escapedExecPath, execArguments, { silent, ignoreReturnCode: true }); const errorCode = await exec_1.exec(this.unityHubExecPath, execArguments, { silent, ignoreReturnCode: true });
if (errorCode) { if (errorCode) {
throw new Error(`There was an error installing the Unity Editor. See logs above for details.`); throw new Error(`There was an error installing the Unity Editor. See logs above for details.`);
} }
@ -7126,8 +7125,8 @@ class SetupMac {
process.env.CHOWN_FILES_TO = buildParameters.chownFilesTo; process.env.CHOWN_FILES_TO = buildParameters.chownFilesTo;
} }
} }
SetupMac.unityHubBasePath = `/Applications/Unity Hub.app`; SetupMac.unityHubBasePath = `/Applications/"Unity Hub.app"`;
SetupMac.unityHubExecPath = `${SetupMac.unityHubBasePath}/Contents/MacOS/Unity Hub`; SetupMac.unityHubExecPath = `${SetupMac.unityHubBasePath}/Contents/MacOS/"Unity Hub"`;
exports["default"] = SetupMac; exports["default"] = SetupMac;

2
dist/index.js.map generated vendored
View File

File diff suppressed because one or more lines are too long

12
src/model/platform-setup/setup-mac.ts
View File

@ -6,17 +6,17 @@ import { restoreCache, saveCache } from '@actions/cache';
import fs from 'node:fs'; import fs from 'node:fs';
class SetupMac { class SetupMac {
static unityHubBasePath = `/Applications/Unity Hub.app`; static unityHubBasePath = `/Applications/"Unity Hub.app"`;
static unityHubExecPath = `${SetupMac.unityHubBasePath}/Contents/MacOS/Unity Hub`; static unityHubExecPath = `${SetupMac.unityHubBasePath}/Contents/MacOS/"Unity Hub"`;
public static async setup(buildParameters: BuildParameters, actionFolder: string) { public static async setup(buildParameters: BuildParameters, actionFolder: string) {
const unityEditorPath = `/Applications/Unity/Hub/Editor/${buildParameters.editorVersion}/Unity.app/Contents/MacOS/Unity`; const unityEditorPath = `/Applications/Unity/Hub/Editor/${buildParameters.editorVersion}/Unity.app/Contents/MacOS/Unity`;
if (!fs.existsSync(this.unityHubExecPath)) { if (!fs.existsSync(this.unityHubExecPath.replace(/"/g, ''))) {
await SetupMac.installUnityHub(buildParameters); await SetupMac.installUnityHub(buildParameters);
} }
if (!fs.existsSync(unityEditorPath)) { if (!fs.existsSync(unityEditorPath.replace(/"/g, ''))) {
await SetupMac.installUnity(buildParameters); await SetupMac.installUnity(buildParameters);
} }
@ -122,11 +122,9 @@ class SetupMac {
'--childModules', '--childModules',
]; ];
const escapedExecPath = this.unityHubExecPath.replace(/ /g, '\\ ');
// Ignoring return code because the log seems to overflow the internal buffer which triggers // Ignoring return code because the log seems to overflow the internal buffer which triggers
// a false error // a false error
const errorCode = await exec(escapedExecPath, execArguments, { silent, ignoreReturnCode: true }); const errorCode = await exec(this.unityHubExecPath, execArguments, { silent, ignoreReturnCode: true });
if (errorCode) { if (errorCode) {
throw new Error(`There was an error installing the Unity Editor. See logs above for details.`); throw new Error(`There was an error installing the Unity Editor. See logs above for details.`);
} }