Skip to content

Commit ceee501

Browse files
committed
Add default OpenPaths EMME folder to path discovery
1 parent aa239fa commit ceee501

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

src/renderer/components/Settings/Settings.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132

133133
.Settings__environment_option_spacer {
134134
width: 100%;
135-
height: 3rem;
135+
height: 4.5rem;
136136
}
137137

138138
.Settings__env_option_text {

src/renderer/components/Settings/Settings.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const EnvironmentOption = ({
1010
}) => {
1111

1212
//Splits the env using OS-spesific delimiter / or \ and then filters out every other substring except the Emme version folder name.
13-
const emmeVersionName = envPath.split(path.sep).filter((subStr) => subStr.startsWith('Emme-'));
13+
const emmeVersionName = envPath.split(path.sep).filter((subStr) => subStr.startsWith('Emme-') ? true : subStr.startsWith('EMME'));
1414

1515
return (
1616
<div className="Settings__environment_option" key={envPath}>

src/renderer/search_emme_pythonpath.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ const listEMMEPythonPaths = () => {
7474
paths.push(
7575
`Program Files\\${commonEmmePath}`,
7676
`Program Files (x86)\\${commonEmmePath}`,
77+
`Program Files\\Bentley\\OpenPaths`,
7778
`${commonEmmePath}`,
7879
)
7980
})
@@ -121,7 +122,7 @@ function hasPythonEnv(basePath) {
121122
try {
122123
const subPaths = fs.readdirSync(basePath)
123124
subPaths.forEach(subPath => {
124-
if(subPath.startsWith("Emme")) {
125+
if(subPath.startsWith("Emme") || subPath.startsWith("EMME")) {
125126
const emmeVersionFolder = path.join(basePath, subPath);
126127
const emmeVersionFolderContents = fs.readdirSync(emmeVersionFolder);
127128
emmeVersionFolderContents.forEach(emmeFolderPath => {

0 commit comments

Comments
 (0)