Buck9195/Asi_Native_FiJi_launcher
1
0
Fork 0
mirror of https://github.com/ij-plugins/ijp-imagej-launcher.git synced 2024-11-13 16:29:01 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better inference of ImageJ directory on macOS - consider launcher being in subdirectory "Contents/MacOS" #7

Browse source
This commit is contained in:
Jarek Sacha 2023-06-10 09:06:17 -04:00
parent 95638a462a
commit 9a0cb694f7
No known key found for this signature in database
GPG key ID: F29625CE62288163
1 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/main/scala/ij_plugins/imagej_launcher/IJDir.scala
View file

@ -30,18 +30,28 @@ object IJDir:
logger.debug(" Considering application directory")
val appPath = Native.applicationPath()
logger.debug(s" Application directory: '$appPath'")
if isIJDir(appPath) then
Right(appPath)
else
logger.debug(" Application directory is not an ImageJ directory")
logger.debug(" Considering current working directory")
val cwd = os.pwd
logger.debug(s" Current working directory: '$cwd'")
if isIJDir(cwd) then
Right(cwd)
else
logger.debug(" Current working directory is not an ImageJ directory.")
Left("Cannot locate ImageJ directory.")
inferIJDir(appPath) match
case Some(p) =>
Right(p)
case None =>
logger.debug(" Application directory is not an ImageJ directory")
logger.debug(" Considering current working directory")
val cwd = os.pwd
logger.debug(s" Current working directory: '$cwd'")
inferIJDir(cwd) match
case Some(p) =>
Right(p)
case None =>
logger.debug(" Current working directory is not an ImageJ directory.")
Left("Cannot locate ImageJ directory.")
private def inferIJDir(path: Path): Option[Path] =
if isIJDir(path) then
Option(path)
else if path.endsWith(os.rel / "Contents" / "MacOS") then
Option(path / os.up / os.up)
else
None
private def isIJDir(path: Path): Boolean =
os.exists(path) &&