-
Notifications
You must be signed in to change notification settings - Fork 63
#451: mac gatekeeper quarantine removal #1794
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.
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
base: main
Are you sure you want to change the base?
Changes from all commits
9eb8de3
aa0d7bd
45e0706
4379492
08110a4
a8a69d7
b309a76
7b08d0e
f14ebcc
6f960df
293e980
6661463
fd33153
84857cb
a5a9b1b
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,7 +20,6 @@ | |
| import com.devonfw.tools.ide.context.IdeContext; | ||
| import com.devonfw.tools.ide.environment.EnvironmentVariables; | ||
| import com.devonfw.tools.ide.environment.EnvironmentVariablesFiles; | ||
| import com.devonfw.tools.ide.io.FileCopyMode; | ||
| import com.devonfw.tools.ide.log.IdeLogLevel; | ||
| import com.devonfw.tools.ide.nls.NlsBundle; | ||
| import com.devonfw.tools.ide.os.MacOsHelper; | ||
|
|
@@ -500,8 +499,7 @@ protected ToolInstallation createToolInstallation(Path rootDir, VersionIdentifie | |
| Path binDir = rootDir; | ||
| if (rootDir != null) { | ||
| // on MacOS applications have a very strange structure - see JavaDoc of findLinkDir and ToolInstallation.linkDir for details. | ||
| linkDir = getMacOsHelper().findLinkDir(rootDir, getBinaryName()); | ||
| binDir = this.context.getFileAccess().getBinPath(linkDir); | ||
| binDir = this.context.getFileAccess().getBinPath(getMacOsHelper().findLinkDir(rootDir, getBinaryName())); | ||
| } | ||
| return createToolInstallation(rootDir, linkDir, binDir, version, newInstallation, environmentContext, additionalInstallation); | ||
| } | ||
|
|
@@ -520,13 +518,6 @@ protected ToolInstallation createToolInstallation(Path rootDir, VersionIdentifie | |
| protected ToolInstallation createToolInstallation(Path rootDir, Path linkDir, Path binDir, VersionIdentifier version, boolean newInstallation, | ||
| EnvironmentContext environmentContext, boolean additionalInstallation) { | ||
|
|
||
| if (linkDir != rootDir) { | ||
| assert (!linkDir.equals(rootDir)); | ||
| Path toolVersionFile = rootDir.resolve(IdeContext.FILE_SOFTWARE_VERSION); | ||
| if (Files.exists(toolVersionFile)) { | ||
| this.context.getFileAccess().copy(toolVersionFile, linkDir, FileCopyMode.COPY_FILE_OVERRIDE); | ||
| } | ||
| } | ||
|
Comment on lines
-523
to
-529
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This might be problematic on macos, but if you remove it, you also need to fix the code to determine the tool version that you broke by just removing this code-block.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. version detection still works just a different approach. before, linkDir pointed inside the .app bundle so the symlink landed there, and the version file had to be copied from rootDir into linkDir. |
||
| ToolInstallation toolInstallation = new ToolInstallation(rootDir, linkDir, binDir, version, newInstallation); | ||
| setEnvironment(environmentContext, toolInstallation, additionalInstallation); | ||
| return toolInstallation; | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.