CM-30491 - Fix working on Windows (#33)

MarshalX · web-flow · commit 884bea0aaecd · 2023-12-21T16:02:21.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,19 +4,24 @@
 
 ## [Unreleased]
 
+## [1.1.1] - 2023-12-21
+
+- Fix working on Windows
+
 ## [1.1.0] - 2023-12-13
 
-- Add Company Guidelines.
-- Fix the severity of detected secrets.
+- Add Company Guidelines
+- Fix the severity of detected secrets
 
 ## [1.0.1] - 2023-12-12
 
-- Fix the creation of many scan jobs on many on-save events for a short period of time.
+- Fix the creation of many scan jobs on many on-save events for a short period of time
 
 ## [1.0.0] - 2023-12-05
 
 The first public release of the plugin.
 
+[1.1.1]: https://github.com/cycodehq/intellij-platform-plugin/releases/tag/v1.1.1
 [1.1.0]: https://github.com/cycodehq/intellij-platform-plugin/releases/tag/v1.1.0
 [1.0.1]: https://github.com/cycodehq/intellij-platform-plugin/releases/tag/v1.0.1
 [1.0.0]: https://github.com/cycodehq/intellij-platform-plugin/releases/tag/v1.0.0
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Cycode IntelliJ Platform Plugin
+# Cycode IntelliJ Platform Plugin (beta)
 
 <!-- Plugin description -->
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,10 +1,10 @@
 # IntelliJ Platform Artifacts Repositories -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html
 
 pluginGroup = com.cycode.plugin
-pluginName = Cycode (beta)
+pluginName = Cycode
 pluginRepositoryUrl = https://github.com/cycodehq/intellij-platform-plugin
 # SemVer format -> https://semver.org
-pluginVersion = 1.1.0
+pluginVersion = 1.1.1
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 211.1
diff --git a/src/main/kotlin/com/cycode/plugin/cli/CliWrapper.kt b/src/main/kotlin/com/cycode/plugin/cli/CliWrapper.kt
@@ -41,6 +41,7 @@ class CliWrapper(val executablePath: String, val workDirectory: String? = null)
     ): CliResult<T> {
         val commandLine = GeneralCommandLine()
         commandLine.charset = Charset.forName("UTF-8")
+        commandLine.exePath = executablePath
 
         if (workDirectory != null) {
             commandLine.workDirectory = File(workDirectory)
@@ -49,12 +50,6 @@ class CliWrapper(val executablePath: String, val workDirectory: String? = null)
         commandLine.environment["CYCODE_API_URL"] = pluginSettings.cliApiUrl
         commandLine.environment["CYCODE_APP_URL"] = pluginSettings.cliAppUrl
 
-        if (SystemInfo.isWindows) {
-            commandLine.addParameter("/c")
-        } else {
-            commandLine.exePath = executablePath
-        }
-
         commandLine.addParameters(*defaultCliArgs)
 
         val additionalArgs = pluginSettings.cliAdditionalParams.split(" ").filterNot { it.isBlank() }.toTypedArray()
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -22,10 +22,10 @@
 
     <extensions defaultExtensionNs="com.intellij">
         <postStartupActivity implementation="com.cycode.plugin.activities.PostStartupActivity"/>
-        <toolWindow factoryClass="com.cycode.plugin.components.toolWindow.CycodeToolWindowFactory" id="Cycode"
+        <toolWindow factoryClass="com.cycode.plugin.components.toolWindow.CycodeToolWindowFactory" id="Cycode (beta)"
                     anchor="bottom"/>
         <projectConfigurable instance="com.cycode.plugin.settings.ApplicationSettingsConfigurable" groupId="tools"
-                             displayName="Cycode"/>
+                             displayName="Cycode (beta)"/>
         <notificationGroup id="Cycode" displayType="BALLOON"/>
     </extensions>
 
diff --git a/src/main/resources/messages/CycodeBundle.properties b/src/main/resources/messages/CycodeBundle.properties
@@ -16,7 +16,7 @@ scanFileResultNotification=Cycode has detected {0} {1} issues in your file. Chec
 scanFileNoResultNotification=No {0} issues were found.
 openProblemsTabAction=Open "Problems" tab
 # tool window
-toolWindowId=Cycode
+toolWindowId=Cycode (beta)
 howToUseLabel=<html>To learn more about how to use Cycode in the IDE by JetBrains, please visit <a href="https://github.com/cycodehq/intellij-platform-plugin/blob/main/README.md">our docs</a>.</html>
 # auth content tab
 authBtn=Authenticate

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Cycode IntelliJ Platform Plugin`
	`1`	`+# Cycode IntelliJ Platform Plugin (beta)`
`2`	`2`
`3`	`3`	`<!-- Plugin description -->`
`4`	`4`