Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

added 'FINDSTR' when windows machine instead of grep #3715

Merged
merged 1 commit into from
Dec 11, 2023
Merged

added 'FINDSTR' when windows machine instead of grep #3715

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
4 changes: 3 additions & 1 deletion src/oc/ocWrapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import * as tmp from 'tmp';
import { CommandOption, CommandText } from '../base/command';
import { CliChannel } from '../cli';
import { ClusterType, KubernetesConsole } from './types';
import { Platform } from '../util/platform';

/**
* A wrapper around the `oc` CLI tool.
Expand Down Expand Up @@ -376,8 +377,9 @@ export class Oc {
* @returns true if the current cluster is an OpenShift cluster, and false otherwise
*/
public async isOpenShiftCluster(): Promise<boolean> {
const find = Platform.OS !== 'win32' ? 'grep' : 'FINDSTR';
try {
const result = await CliChannel.getInstance().executeTool(new CommandText('oc api-resources | grep openshift'));
const result = await CliChannel.getInstance().executeTool(new CommandText(`oc api-resources | ${find} openshift`));
if (result.stdout.length === 0) {
return false;
}
Expand Down
Loading