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

Add quotes back

pull/552/head
VioletXF 2023-07-28 04:34:21 +09:00
parent de94250c1b
commit 53c5312d78
3 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dist/index.js generated vendored
View File

@ -7087,26 +7087,9 @@ class SetupMac {
...moduleArguments, ...moduleArguments,
'--childModules', '--childModules',
]; ];
<<<<<<< HEAD
const escapedExecPath = this.unityHubExecPath.replace(/ /g, '\\ ');
||||||| parent of 0374d67 (Fix unity path)
const moduleArgument = SetupMac.getModuleParametersForTargetPlatform(buildParameters.targetPlatform);
const command = `${this.unityHubExecPath} -- --headless install \
--version ${buildParameters.editorVersion} \
--changeset ${unityChangeset.changeset} \
${moduleArgument} \
--childModules `;
=======
>>>>>>> 0374d67 (Fix unity path)
// 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
<<<<<<< HEAD
const errorCode = await exec_1.exec(escapedExecPath, execArguments, { silent, ignoreReturnCode: true });
||||||| parent of 0374d67 (Fix unity path)
const errorCode = await exec_1.exec(command, undefined, { silent, ignoreReturnCode: true });
=======
const errorCode = await exec_1.exec(this.unityHubExecPath, execArguments, { silent, ignoreReturnCode: true }); const errorCode = await exec_1.exec(this.unityHubExecPath, execArguments, { silent, ignoreReturnCode: true });
>>>>>>> 0374d67 (Fix unity path)
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.`);
} }
@ -7142,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;

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

File diff suppressed because one or more lines are too long

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

@ -6,8 +6,8 @@ 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`;