Skip to content

Feature/v3.11.x/1115 osx executable args issue #109

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 2 commits into from
Dec 20, 2018
Merged

Feature/v3.11.x/1115 osx executable args issue #109

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
173728c
Fix launching osx apps with args
witcher112 Dec 13, 2018
55b1249
Fix searching for predefined OSX app
witcher112 Dec 13, 2018
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
33 changes: 22 additions & 11 deletions Assets/PatchKit Patcher/Scripts/AppStarter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,17 @@ public AppStarter(App app)

private string ResolveExecutablePath(AppVersion appVersion)
{
PlatformType platformType = Platform.GetPlatformType();

if (!string.IsNullOrEmpty(appVersion.MainExecutable))
{
string executablePath = Path.Combine(_app.LocalDirectory.Path, appVersion.MainExecutable);

if (File.Exists(executablePath))
bool isOSXApp = platformType == PlatformType.OSX &&
Copy link
Contributor

@Dzejkop Dzejkop Dec 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any chance that Platform.GetPlatformType returns OSX but the application isn't an OSX app?

Copy link
Contributor Author

@witcher112 witcher112 Dec 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope, it's always the same.

Copy link
Contributor

@Dzejkop Dzejkop Dec 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The we shouldn't need all the other conditions, right?

...
executablePath.EndsWith(".app") &&
Directory.Exists(executablePath);

Copy link
Contributor Author

@witcher112 witcher112 Dec 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't checking whether application platform that secret we are using is OSX, but whether the appVersion.MainExecutable points to valid OSX .app.

executablePath.EndsWith(".app") &&
Directory.Exists(executablePath);

if (File.Exists(executablePath) || isOSXApp)
{
return executablePath;
}
Expand All @@ -50,7 +56,6 @@ private string ResolveExecutablePath(AppVersion appVersion)

}

PlatformType platformType = Platform.GetPlatformType();
return AppFinder.FindExecutable(_app.LocalDirectory.Path, platformType);
}

Expand Down Expand Up @@ -87,12 +92,7 @@ private void StartAppVersion(AppVersion appVersion)
}
}

var processStartInfo = GetProcessStartInfo(appFilePath, platformType);

if (!string.IsNullOrEmpty(appVersion.MainExecutableArgs))
{
processStartInfo.Arguments += " " + appVersion.MainExecutableArgs;
}
var processStartInfo = GetProcessStartInfo(appFilePath, appVersion.MainExecutableArgs, platformType);

StartAppProcess(processStartInfo);
}
Expand All @@ -102,8 +102,13 @@ private bool NeedPermissionFix(PlatformType platformType)
return platformType == PlatformType.OSX || platformType == PlatformType.Linux;
}

private ProcessStartInfo GetProcessStartInfo(string executablePath, PlatformType platform)
private ProcessStartInfo GetProcessStartInfo(string executablePath, string mainExecutableArgs, PlatformType platform)
{
if (mainExecutableArgs == null)
{
mainExecutableArgs = string.Empty;
}

string workingDir = Path.GetDirectoryName(executablePath) ?? string.Empty;
switch (platform)
{
Expand All @@ -113,20 +118,26 @@ private ProcessStartInfo GetProcessStartInfo(string executablePath, PlatformType
return new ProcessStartInfo
{
FileName = executablePath,
Arguments = string.Format("+patcher-data-location \"{0}\"", _app.LocalMetaData.GetFilePath()),
Arguments = string.Format("+patcher-data-location \"{0}\" " + mainExecutableArgs, _app.LocalMetaData.GetFilePath()),
WorkingDirectory = workingDir
};
case PlatformType.OSX:
if (!string.IsNullOrEmpty(mainExecutableArgs))
{
mainExecutableArgs = " --args " + mainExecutableArgs;
}

return new ProcessStartInfo
{
FileName = "open",
Arguments = string.Format("\"{0}\"", executablePath),
Arguments = string.Format("\"{0}\"{1}", executablePath, mainExecutableArgs),
WorkingDirectory = workingDir
};
case PlatformType.Linux:
return new ProcessStartInfo
{
FileName = executablePath,
Arguments = mainExecutableArgs,
WorkingDirectory = workingDir
};
default:
Expand Down