Skip to content
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

Fix IntelliJ cleanup logic for macOs #301

Merged
merged 3 commits into from
Oct 29, 2022
Merged

Fix IntelliJ cleanup logic for macOs #301

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b12b8a
Fix DownloadedIntelliJ.cleanup() logic for macOs
LukaszKontowski Oct 25, 2022
be1978e
Fix SingleRunFixtureTest.removesDirectoriesEvenAfterFailureToRunIntel…
LukaszKontowski Oct 25, 2022
8671447
fix formatting and code style
LukaszKontowski Oct 25, 2022
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
5 changes: 4 additions & 1 deletion ...driver/sources/src/main/scala/org/virtuslab/ideprobe/ide/intellij/InstalledIntelliJ.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,10 @@ final class DownloadedIntelliJ(
probePaths.logExport.foreach { path =>
paths.logs.copyDir(path.resolve(getPathWithVersionNumber(root)).resolve("logs"))
}
root.delete()
if (OS.Current == OS.Mac && root.name == "Contents")
root.getParent.delete()
Comment on lines +230 to +231
Copy link
Contributor Author

Choose a reason for hiding this comment

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

As we want to delete whole IntelliJ instance directory, not only Contents/ (which is a subdirectory)

else
root.delete()
}

/*
Expand Down
6 changes: 4 additions & 2 deletions ...ver/sources/src/test/scala/org/virtuslab/ideprobe/dependencies/SingleRunFixtureTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package org.virtuslab.ideprobe.dependencies

import org.virtuslab.ideprobe.OS

import java.nio.file.Files
import java.nio.file.Path
import java.nio.file.Paths
Expand All @@ -19,7 +21,6 @@ import org.virtuslab.ideprobe.Config
import org.virtuslab.ideprobe.Extensions._
import org.virtuslab.ideprobe.IdeProbeFixture
import org.virtuslab.ideprobe.IntelliJFixture
import org.virtuslab.ideprobe.OS
import org.virtuslab.ideprobe.Shell
import org.virtuslab.ideprobe.SingleRunIntelliJ

Expand Down Expand Up @@ -56,8 +57,9 @@ final class SingleRunFixtureTest extends IdeProbeFixture with WorkspaceFixture w

@Test
def removesDirectoriesEvenAfterFailureToRunIntelliJ(): Unit = {
val intellijLauncher = if (OS.Current == OS.Mac) "idea" else "idea.sh"
Copy link
Contributor

@PawelLipski PawelLipski Oct 26, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Out of curiosity, what's the type of this idea file on Mac (type in the sense of e.g. file command?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

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

Copy link
Contributor

Choose a reason for hiding this comment

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

Okay... so not a script (idea.sh), as on Linux

Copy link
Contributor

Choose a reason for hiding this comment

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

it is an objective c app that reads some stuff from plist, modifies vmoptions and starts IJ

val intelliJFixture = IntelliJFixture().withAfterIntelliJInstall((_, intellij) =>
Files.delete(intellij.paths.root.resolve("bin").resolve("idea.sh")) // To prevent the IDE from launching.
Files.delete(intellij.paths.root.resolve("bin").resolve(intellijLauncher)) // To prevent the IDE from launching.
)

val instancesDir = intelliJFixture.intelliJProvider.paths.instances
Expand Down