Skip to content
This repository has been archived by the owner on Dec 3, 2023. It is now read-only.

fix: fix gcloud SDK detection on Windows #384

Merged
merged 1 commit into from
Feb 24, 2021
Merged

fix: fix gcloud SDK detection on Windows #384

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 2 additions & 8 deletions google-cloud-core/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
Expand Down Expand Up @@ -275,13 +274,8 @@ public Process getProcess() {
}

private boolean isGcloudInstalled() {
Map<String, String> env = System.getenv();
for (String envName : env.keySet()) {
if ("PATH".equals(envName)) {
return env.get(envName).contains("google-cloud-sdk");
}
}
return false;
String path = System.getenv("PATH");
return path != null && path.contains("google-cloud-sdk");
}

private boolean isEmulatorUpToDate() throws IOException, InterruptedException {
Expand Down