Skip to content

Commit 3f5595a

Browse files
committed
Formatted InstallLocations.cs and removed -D option from Java workflow
1 parent 00f2e16 commit 3f5595a

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

.github/workflows/java-linux-snippets.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ jobs:
4141
SENZING_DIR: "/opt/senzing/er"
4242
run: |
4343
cd "${GITHUB_WORKSPACE}"/java
44-
mvn clean install -B -Dsenzing.support.dir="/opt/senzing/data"
44+
mvn clean package
4545
4646
- name: run java snippets
4747
run: |
4848
cd "${GITHUB_WORKSPACE}"/java
49-
java -jar target/sz-sdk-snippets.jar all -Dsenzing.support.dir="/opt/senzing/data"
49+
java -jar target/sz-sdk-snippets.jar all

csharp/runner/SnippetRunner/InstallLocations.cs

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,9 @@ private static bool IsDirectory(string path)
201201
defaultSupportPath = "/opt/senzing/er/data";
202202
break;
203203
case PlatformID.Unix:
204-
defaultInstallPath = "/opt/senzing/er";
205-
defaultConfigPath = "/etc/opt/senzing";
206-
defaultSupportPath = "/opt/senzing/data";
204+
defaultInstallPath = "/opt/senzing/er";
205+
defaultConfigPath = "/etc/opt/senzing";
206+
defaultSupportPath = "/opt/senzing/data";
207207
break;
208208
default:
209209
throw new NotSupportedException(
@@ -291,18 +291,24 @@ private static bool IsDirectory(string path)
291291
}
292292

293293
// check if an explicit support path has been specified
294-
if (supportPath == null || supportPath.Trim().Length == 0) {
294+
if (supportPath == null || supportPath.Trim().Length == 0)
295+
{
295296
// check if using a dev build
296-
if ("dist".Equals(installDir.Name, OrdinalIgnoreCase)) {
297+
if ("dist".Equals(installDir.Name, OrdinalIgnoreCase))
298+
{
297299
// use the "data" sub-directory of the dev build
298300
supportDir = new DirectoryInfo(
299301
Path.Combine(installDir.FullName, "data"));
300-
} else {
302+
}
303+
else
304+
{
301305
// no explicit path, try the default support path
302306
supportDir = new DirectoryInfo(defaultSupportPath);
303307
}
304308

305-
} else {
309+
}
310+
else
311+
{
306312
// use the specified explicit path
307313
supportDir = new DirectoryInfo(supportPath);
308314
}

0 commit comments

Comments
 (0)