Fix IntelliJ cleanup logic for macOs #301
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LukaszKontowski
changed the title
LukaszKontowski
commented
Oct 25, 2022
Comment on lines
+230
to
+231
| if (OS.Current == OS.Mac && root.name == "Contents") | ||
| root.getParent.delete() |
There was a problem hiding this comment.
As we want to delete whole IntelliJ instance directory, not only Contents/ (which is a subdirectory)
PawelLipski
reviewed
Oct 26, 2022
| @@ -56,8 +56,9 @@ final class SingleRunFixtureTest extends IdeProbeFixture with WorkspaceFixture w | |||
|
|
|||
| @Test | |||
| def removesDirectoriesEvenAfterFailureToRunIntelliJ(): Unit = { | |||
| val intellijLauncher = if (OS.Current == OS.Mac) "idea" else "idea.sh" | |||
There was a problem hiding this comment.
Out of curiosity, what's the type of this idea file on Mac (type in the sense of e.g. file command?
There was a problem hiding this comment.
Let me paste the output of the file command:
lkontowski@lkontowski-MacBook-Pro /Applications/IntelliJ IDEA CE.app/Contents/MacOS
% file idea
idea: Mach-O universal binary with 2 architectures: [x86_64:Mach-O 64-bit executable x86_64
- Mach-O 64-bit executable x86_64] [arm64:Mach-O 64-bit executable arm64
- Mach-O 64-bit executable arm64]
idea (for architecture x86_64): Mach-O 64-bit executable x86_64
idea (for architecture arm64): Mach-O 64-bit executable arm64
There was a problem hiding this comment.
Okay... so not a script (idea.sh), as on Linux
There was a problem hiding this comment.
it is an objective c app that reads some stuff from plist, modifies vmoptions and starts IJ
lukaszwawrzyk
approved these changes
Oct 28, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related to #238 (but does not close it).
Fixes IntelliJ cleanup logic for macOs and makes
SingleRunFixtureTesttests succeed on macOs if.dmgextension is used asprobe.intellij.version.ext.