MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 11:53:49 +07:00
Code Issues Packages Projects Releases Wiki Activity

[platform] setting Windows Defender helper script diagnostic output encoding (IDEA-224689)

Browse Source 
GitOrigin-RevId: a1d43d955ada2b2d70278337c5f6e8804f14a0a5
This commit is contained in:
Roman Shevchenko
2023-01-16 12:11:54 +01:00
committed by intellij-monorepo-bot
parent e6547be07c
commit b0e2bc415f
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/win/defender-exclusions.ps1
View File

@@ -5,6 +5,8 @@
#Requires -RunAsAdministrator #Requires -RunAsAdministrator
[Console]::OutputEncoding = [System.Text.Encoding]::UTF8
if ($args.Count -eq 0) { if ($args.Count -eq 0) {
Write-Host "usage: $PSCommandPath path [path ...]" Write-Host "usage: $PSCommandPath path [path ...]"
exit 1 exit 1

6
platform/platform-impl/src/com/intellij/diagnostic/WindowsDefenderChecker.java
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.diagnostic; package com.intellij.diagnostic;
import com.intellij.execution.ExecutionException; import com.intellij.execution.ExecutionException;
@@ -22,6 +22,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.ArrayList; import java.util.ArrayList;
@@ -180,7 +181,8 @@ public class WindowsDefenderChecker {
Stream.of(psh.getPath(), "-ExecutionPolicy", "Bypass", "-NonInteractive", "-File", script.toString()), Stream.of(psh.getPath(), "-ExecutionPolicy", "Bypass", "-NonInteractive", "-File", script.toString()),
paths.stream().map(Path::toString) paths.stream().map(Path::toString)
).toList()), ).toList()),
""); ""
).withCharset(StandardCharsets.UTF_8);
output = run(command); output = run(command);
if (output.getExitCode() != 0) { if (output.getExitCode() != 0) {
LOG.info("script failed:\n[" + output.getExitCode() + "] " + command + "\noutput: " + output.getStdout().trim()); LOG.info("script failed:\n[" + output.getExitCode() + "] " + command + "\noutput: " + output.getStdout().trim());