haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make macOS path determination tolerant of bundle renaming 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/8922
This commit is contained in:
Jon Evans 2021-08-13 16:37:15 -04:00
parent 80355f04a9
commit 37fd7c785e
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/paths.cpp
View File

@ -342,12 +342,15 @@ wxString PATHS::GetOSXKicadDataDir()
// This must be mapped to main bundle for everything but kicad.app
const wxArrayString dirs = ddir.GetDirs();
if( dirs[dirs.GetCount() - 3].Lower() != wxT( "kicad.app" ) )
// Check if we are the main kicad binary. in this case, the path will be
// /path/to/bundlename.app/Contents/SharedSupport
// If we are an aux binary, the path will be something like
// /path/to/bundlename.app/Contents/Applications/<standalone>.app/Contents/SharedSupport
if( dirs.GetCount() >= 6 &&
dirs[dirs.GetCount() - 4] == wxT( "Applications" ) &&
dirs[dirs.GetCount() - 6].Lower().EndsWith( wxT( "app" ) ) )
{
// Bundle structure resp. current path is
// kicad.app/Contents/Applications/<standalone>.app/Contents/SharedSupport
// and will be mapped to
// kicad.app/Contents/SharedSupprt
ddir.RemoveLastDir();
ddir.RemoveLastDir();
ddir.RemoveLastDir();