From 34947f65d908a05eeb022484e2290188735b38ef Mon Sep 17 00:00:00 2001
From: Ruud Senden <8635138+rsenden@users.noreply.github.com>
Date: Thu, 25 Jan 2024 07:40:29 +0100
Subject: [PATCH] chore: Improve global bin script processing

---
 .../_common/helper/ToolInstallationHelper.java   |  8 ++------
 .../cli/tool/_common/helper/ToolInstaller.java   | 16 ++++++++++------
 .../cmd/ToolBugTrackerUtilityInstallCommand.java |  5 +++--
 .../cli/cmd/ToolDebrickedCliInstallCommand.java  |  5 +++--
 .../fcli/cli/cmd/ToolFcliInstallCommand.java     |  9 +++++----
 .../cli/cmd/ToolFoDUploaderInstallCommand.java   |  5 +++--
 .../cli/cmd/ToolSCClientInstallCommand.java      |  5 +++--
 .../cli/cmd/ToolVulnExporterInstallCommand.java  |  5 +++--
 .../extra-files/global_bin/debricked             |  2 --
 .../extra-files/global_bin/debricked.bat         |  1 -
 .../fortify/cli/tool/extra-files/global-bin/bash |  2 ++
 .../fortify/cli/tool/extra-files/global-bin/bat  |  2 ++
 .../tool/fcli/extra-files/jar/global_bin/fcli    |  2 --
 .../fcli/extra-files/jar/global_bin/fcli.bat     |  1 -
 .../tool/fcli/extra-files/native/global_bin/fcli |  2 --
 .../fcli/extra-files/native/global_bin/fcli.bat  |  1 -
 .../extra-files/global_bin/FoDUpload             |  2 --
 .../extra-files/global_bin/FoDUpload.bat         |  1 -
 .../sc_client/extra-files/global_bin/scancentral |  2 --
 .../extra-files/global_bin/scancentral.bat       |  1 -
 .../global_bin/FortifyVulnerabilityExporter      |  2 --
 .../global_bin/FortifyVulnerabilityExporter.bat  |  1 -
 22 files changed, 36 insertions(+), 44 deletions(-)
 delete mode 100644 fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/debricked_cli/extra-files/global_bin/debricked
 delete mode 100644 fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/debricked_cli/extra-files/global_bin/debricked.bat
 create mode 100644 fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/extra-files/global-bin/bash
 create mode 100644 fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/extra-files/global-bin/bat
 delete mode 100644 fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fcli/extra-files/jar/global_bin/fcli
 delete mode 100644 fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fcli/extra-files/jar/global_bin/fcli.bat
 delete mode 100644 fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fcli/extra-files/native/global_bin/fcli
 delete mode 100644 fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fcli/extra-files/native/global_bin/fcli.bat
 delete mode 100644 fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fod_uploader/extra-files/global_bin/FoDUpload
 delete mode 100644 fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fod_uploader/extra-files/global_bin/FoDUpload.bat
 delete mode 100644 fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/sc_client/extra-files/global_bin/scancentral
 delete mode 100644 fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/sc_client/extra-files/global_bin/scancentral.bat
 delete mode 100644 fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln_exporter/extra-files/global_bin/FortifyVulnerabilityExporter
 delete mode 100644 fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln_exporter/extra-files/global_bin/FortifyVulnerabilityExporter.bat

diff --git a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolInstallationHelper.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolInstallationHelper.java
index 8d63d882e1..3c591381c5 100644
--- a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolInstallationHelper.java
+++ b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolInstallationHelper.java
@@ -17,12 +17,8 @@
 import com.fortify.cli.common.util.FcliDataHelper;
 
 public final class ToolInstallationHelper {
-    public static final String getToolResourceDir(String toolName) {
-        return String.format("com/fortify/cli/tool/%s", toolName);
-    }
-    
-    public static final String getToolResourceFile(String toolName, String fileName) {
-        return String.format("%s/%s", getToolResourceDir(toolName.replace('-', '_')), fileName);
+    public static final String getToolResourceLocation(String subPath) {
+        return String.format("com/fortify/cli/tool/%s", subPath);
     }
     
     public static Path getToolsStatePath() {
diff --git a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolInstaller.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolInstaller.java
index df9d6e4f7a..3db9ac9ed4 100644
--- a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolInstaller.java
+++ b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolInstaller.java
@@ -76,6 +76,10 @@ public static enum DigestMismatchAction {
         fail, warn
     }
     
+    public static enum GlobalBinScriptType {
+        bash, bat
+    }
+    
     public final ToolDefinitionRootDescriptor getDefinitionRootDescriptor() {
         return _definitionRootDescriptor.get(()->ToolDefinitionsHelper.getToolDefinitionRootDescriptor(toolName));
     }
@@ -145,21 +149,21 @@ public final void copyBinResource(String resourceFile) {
     }
     
     @SneakyThrows
-    public final void copyGlobalBinResource(String resourceFile) {
+    public final void installGlobalBinScript(GlobalBinScriptType type, String globalBinScriptName, String target) {
         var globalBinPath = getGlobalBinPath();
         if ( globalBinPath!=null ) {
-            var fullResourceFile = getFullResourceFile(resourceFile);
-            var destFilePath = globalBinPath.resolve(Path.of(resourceFile).getFileName());
-            FileUtils.copyResource(fullResourceFile, destFilePath, StandardCopyOption.REPLACE_EXISTING);
+            var resourceFile = ToolInstallationHelper.getToolResourceLocation("extra-files/global-bin/"+type.name());
+            var destFilePath = globalBinPath.resolve(globalBinScriptName);
+            FileUtils.copyResource(resourceFile, destFilePath, StandardCopyOption.REPLACE_EXISTING);
             String content = new String(Files.readAllBytes(destFilePath), "ASCII");
-            content = content.replace("{{binDir}}", getBinPath().toString());
+            content = content.replace("{{target}}", getTargetPath().resolve(target).toString());
             Files.write(destFilePath, content.getBytes("ASCII"));
             ToolInstaller.updateFilePermissions(destFilePath);
         }
     }
     
     private String getFullResourceFile(String resourceFile) {
-        return String.format("com/fortify/cli/tool/%s/%s", getToolName().replace("-", "_"), resourceFile);
+        return ToolInstallationHelper.getToolResourceLocation(String.format("%s/%s", getToolName().replace("-", "_"), resourceFile));
     }
     
     private final ToolInstallationResult install(ToolDefinitionArtifactDescriptor artifactDescriptor) {
diff --git a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/bugtracker_utility/cli/cmd/ToolBugTrackerUtilityInstallCommand.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/bugtracker_utility/cli/cmd/ToolBugTrackerUtilityInstallCommand.java
index 71c0462d29..b44fc4accc 100644
--- a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/bugtracker_utility/cli/cmd/ToolBugTrackerUtilityInstallCommand.java
+++ b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/bugtracker_utility/cli/cmd/ToolBugTrackerUtilityInstallCommand.java
@@ -17,6 +17,7 @@
 import com.fortify.cli.common.output.cli.mixin.OutputHelperMixins;
 import com.fortify.cli.tool._common.cli.cmd.AbstractToolInstallCommand;
 import com.fortify.cli.tool._common.helper.ToolInstaller;
+import com.fortify.cli.tool._common.helper.ToolInstaller.GlobalBinScriptType;
 import com.fortify.cli.tool._common.helper.ToolInstaller.ToolInstallationResult;
 
 import lombok.Getter;
@@ -38,8 +39,8 @@ protected String getDefaultArtifactType() {
     protected void postInstall(ToolInstaller installer, ToolInstallationResult installationResult) {
         installer.copyBinResource("extra-files/bin/FortifyBugTrackerUtility");
         installer.copyBinResource("extra-files/bin/FortifyBugTrackerUtility.bat");
-        installer.copyGlobalBinResource("extra-files/global_bin/FortifyBugTrackerUtility");
-        installer.copyGlobalBinResource("extra-files/global_bin/FortifyBugTrackerUtility.bat");
+        installer.installGlobalBinScript(GlobalBinScriptType.bash, "FortifyBugTrackerUtility", "bin/FortifyBugTrackerUtility");
+        installer.installGlobalBinScript(GlobalBinScriptType.bat, "FortifyBugTrackerUtility.bat", "bin/FortifyBugTrackerUtility.bat");
         
         var targetPath = installer.getTargetPath();
         var jarFiles = Files.find(targetPath, 1, 
diff --git a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/debricked_cli/cli/cmd/ToolDebrickedCliInstallCommand.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/debricked_cli/cli/cmd/ToolDebrickedCliInstallCommand.java
index 7244e377e9..a23fc4cebe 100644
--- a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/debricked_cli/cli/cmd/ToolDebrickedCliInstallCommand.java
+++ b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/debricked_cli/cli/cmd/ToolDebrickedCliInstallCommand.java
@@ -16,6 +16,7 @@
 import com.fortify.cli.common.util.FileUtils;
 import com.fortify.cli.tool._common.cli.cmd.AbstractToolInstallCommand;
 import com.fortify.cli.tool._common.helper.ToolInstaller;
+import com.fortify.cli.tool._common.helper.ToolInstaller.GlobalBinScriptType;
 import com.fortify.cli.tool._common.helper.ToolInstaller.ToolInstallationResult;
 
 import lombok.Getter;
@@ -36,7 +37,7 @@ protected String getDefaultArtifactType() {
     @Override @SneakyThrows
     protected void postInstall(ToolInstaller installer, ToolInstallationResult installationResult) {
         FileUtils.moveFiles(installer.getTargetPath(), installer.getBinPath(), "debricked(\\.exe)?");
-        installer.copyGlobalBinResource("extra-files/global_bin/debricked");
-        installer.copyGlobalBinResource("extra-files/global_bin/debricked.bat");
+        installer.installGlobalBinScript(GlobalBinScriptType.bash, "debricked", "bin/debricked");
+        installer.installGlobalBinScript(GlobalBinScriptType.bat, "debricked.bat", "bin/debricked.exe");
     }
 }
diff --git a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/fcli/cli/cmd/ToolFcliInstallCommand.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/fcli/cli/cmd/ToolFcliInstallCommand.java
index dec9e3105d..a18f22564f 100644
--- a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/fcli/cli/cmd/ToolFcliInstallCommand.java
+++ b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/fcli/cli/cmd/ToolFcliInstallCommand.java
@@ -19,6 +19,7 @@
 import com.fortify.cli.common.util.FileUtils;
 import com.fortify.cli.tool._common.cli.cmd.AbstractToolInstallCommand;
 import com.fortify.cli.tool._common.helper.ToolInstaller;
+import com.fortify.cli.tool._common.helper.ToolInstaller.GlobalBinScriptType;
 import com.fortify.cli.tool._common.helper.ToolInstaller.ToolInstallationResult;
 
 import lombok.Getter;
@@ -43,11 +44,11 @@ protected void postInstall(ToolInstaller installer, ToolInstallationResult insta
         if ( Files.exists(installPath.resolve("fcli.jar")) ) {
             installer.copyBinResource("extra-files/jar/bin/fcli");
             installer.copyBinResource("extra-files/jar/bin/fcli.bat");
-            installer.copyGlobalBinResource("extra-files/jar/global_bin/fcli");
-            installer.copyGlobalBinResource("extra-files/jar/global_bin/fcli.bat");
+            installer.installGlobalBinScript(GlobalBinScriptType.bash, "fcli", "bin/fcli");
+            installer.installGlobalBinScript(GlobalBinScriptType.bat, "fcli.bat", "bin/fcli.bat");
         } else {
-            installer.copyGlobalBinResource("extra-files/native/global_bin/fcli");
-            installer.copyGlobalBinResource("extra-files/native/global_bin/fcli.bat");
+            installer.installGlobalBinScript(GlobalBinScriptType.bash, "fcli", "bin/fcli");
+            installer.installGlobalBinScript(GlobalBinScriptType.bat, "fcli.bat", "bin/fcli.exe");
         }
     }
 }
diff --git a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderInstallCommand.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderInstallCommand.java
index 419a0586fa..8a47cfba73 100644
--- a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderInstallCommand.java
+++ b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderInstallCommand.java
@@ -15,6 +15,7 @@
 import com.fortify.cli.common.output.cli.mixin.OutputHelperMixins;
 import com.fortify.cli.tool._common.cli.cmd.AbstractToolInstallCommand;
 import com.fortify.cli.tool._common.helper.ToolInstaller;
+import com.fortify.cli.tool._common.helper.ToolInstaller.GlobalBinScriptType;
 import com.fortify.cli.tool._common.helper.ToolInstaller.ToolInstallationResult;
 
 import lombok.Getter;
@@ -36,7 +37,7 @@ protected String getDefaultArtifactType() {
     protected void postInstall(ToolInstaller installer, ToolInstallationResult installationResult) {
         installer.copyBinResource("extra-files/bin/FoDUpload");
         installer.copyBinResource("extra-files/bin/FoDUpload.bat");
-        installer.copyGlobalBinResource("extra-files/global_bin/FoDUpload");
-        installer.copyGlobalBinResource("extra-files/global_bin/FoDUpload.bat");
+        installer.installGlobalBinScript(GlobalBinScriptType.bash, "FoDUpload", "bin/FoDUpload");
+        installer.installGlobalBinScript(GlobalBinScriptType.bat, "FoDUpload.bat", "bin/FoDUpload.bat");
     }
 }
diff --git a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientInstallCommand.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientInstallCommand.java
index f0ad5a1992..73f3f750e1 100644
--- a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientInstallCommand.java
+++ b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientInstallCommand.java
@@ -22,6 +22,7 @@
 import com.fortify.cli.common.util.StringUtils;
 import com.fortify.cli.tool._common.cli.cmd.AbstractToolInstallCommand;
 import com.fortify.cli.tool._common.helper.ToolInstaller;
+import com.fortify.cli.tool._common.helper.ToolInstaller.GlobalBinScriptType;
 import com.fortify.cli.tool._common.helper.ToolInstaller.ToolInstallationResult;
 
 import lombok.Getter;
@@ -44,8 +45,8 @@ protected String getDefaultArtifactType() {
     @Override @SneakyThrows
     protected void postInstall(ToolInstaller installer, ToolInstallationResult installationResult) {
         updateClientAuthToken(installer.getTargetPath());
-        installer.copyGlobalBinResource("extra-files/global_bin/scancentral");
-        installer.copyGlobalBinResource("extra-files/global_bin/scancentral.bat");
+        installer.installGlobalBinScript(GlobalBinScriptType.bash, "scancentral", "bin/scancentral");
+        installer.installGlobalBinScript(GlobalBinScriptType.bat, "scancentral.bat", "bin/scancentral.bat");
     }
     
     private void updateClientAuthToken(Path installPath) throws IOException {
diff --git a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterInstallCommand.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterInstallCommand.java
index 06068b2a45..b210c3722a 100644
--- a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterInstallCommand.java
+++ b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterInstallCommand.java
@@ -15,6 +15,7 @@
 import com.fortify.cli.common.output.cli.mixin.OutputHelperMixins;
 import com.fortify.cli.tool._common.cli.cmd.AbstractToolInstallCommand;
 import com.fortify.cli.tool._common.helper.ToolInstaller;
+import com.fortify.cli.tool._common.helper.ToolInstaller.GlobalBinScriptType;
 import com.fortify.cli.tool._common.helper.ToolInstaller.ToolInstallationResult;
 
 import lombok.Getter;
@@ -36,7 +37,7 @@ protected String getDefaultArtifactType() {
     protected void postInstall(ToolInstaller installer, ToolInstallationResult installationResult) {
         installer.copyBinResource("extra-files/bin/FortifyVulnerabilityExporter");
         installer.copyBinResource("extra-files/bin/FortifyVulnerabilityExporter.bat");
-        installer.copyGlobalBinResource("extra-files/global_bin/FortifyVulnerabilityExporter");
-        installer.copyGlobalBinResource("extra-files/global_bin/FortifyVulnerabilityExporter.bat");
+        installer.installGlobalBinScript(GlobalBinScriptType.bash, "FortifyVulnerabilityExporter", "bin/FortifyVulnerabilityExporter");
+        installer.installGlobalBinScript(GlobalBinScriptType.bat, "FortifyVulnerabilityExporter.bat", "bin/FortifyVulnerabilityExporter.bat");
     }
 }
diff --git a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/debricked_cli/extra-files/global_bin/debricked b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/debricked_cli/extra-files/global_bin/debricked
deleted file mode 100644
index 6601ac992b..0000000000
--- a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/debricked_cli/extra-files/global_bin/debricked
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-{{binDir}}/debricked "$@"
\ No newline at end of file
diff --git a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/debricked_cli/extra-files/global_bin/debricked.bat b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/debricked_cli/extra-files/global_bin/debricked.bat
deleted file mode 100644
index df0877d75f..0000000000
--- a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/debricked_cli/extra-files/global_bin/debricked.bat
+++ /dev/null
@@ -1 +0,0 @@
-{{binDir}}\debricked.exe %*
\ No newline at end of file
diff --git a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/extra-files/global-bin/bash b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/extra-files/global-bin/bash
new file mode 100644
index 0000000000..02f9684dfa
--- /dev/null
+++ b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/extra-files/global-bin/bash
@@ -0,0 +1,2 @@
+#!/bin/bash
+{{target}} "$@"
\ No newline at end of file
diff --git a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/extra-files/global-bin/bat b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/extra-files/global-bin/bat
new file mode 100644
index 0000000000..4eff45d38c
--- /dev/null
+++ b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/extra-files/global-bin/bat
@@ -0,0 +1,2 @@
+@ECHO OFF
+{{target}} %*
\ No newline at end of file
diff --git a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fcli/extra-files/jar/global_bin/fcli b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fcli/extra-files/jar/global_bin/fcli
deleted file mode 100644
index a0f6ee8bc4..0000000000
--- a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fcli/extra-files/jar/global_bin/fcli
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-{{binDir}}/fcli "$@"
\ No newline at end of file
diff --git a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fcli/extra-files/jar/global_bin/fcli.bat b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fcli/extra-files/jar/global_bin/fcli.bat
deleted file mode 100644
index 7e14823d22..0000000000
--- a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fcli/extra-files/jar/global_bin/fcli.bat
+++ /dev/null
@@ -1 +0,0 @@
-{{binDir}}\fcli.bat %*
\ No newline at end of file
diff --git a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fcli/extra-files/native/global_bin/fcli b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fcli/extra-files/native/global_bin/fcli
deleted file mode 100644
index a0f6ee8bc4..0000000000
--- a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fcli/extra-files/native/global_bin/fcli
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-{{binDir}}/fcli "$@"
\ No newline at end of file
diff --git a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fcli/extra-files/native/global_bin/fcli.bat b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fcli/extra-files/native/global_bin/fcli.bat
deleted file mode 100644
index 50323686b2..0000000000
--- a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fcli/extra-files/native/global_bin/fcli.bat
+++ /dev/null
@@ -1 +0,0 @@
-{{binDir}}\fcli.exe %*
\ No newline at end of file
diff --git a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fod_uploader/extra-files/global_bin/FoDUpload b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fod_uploader/extra-files/global_bin/FoDUpload
deleted file mode 100644
index f34f42a9f2..0000000000
--- a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fod_uploader/extra-files/global_bin/FoDUpload
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-{{binDir}}/FoDUpload "$@"
\ No newline at end of file
diff --git a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fod_uploader/extra-files/global_bin/FoDUpload.bat b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fod_uploader/extra-files/global_bin/FoDUpload.bat
deleted file mode 100644
index dc39f8cd4a..0000000000
--- a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/fod_uploader/extra-files/global_bin/FoDUpload.bat
+++ /dev/null
@@ -1 +0,0 @@
-{{binDir}}\FoDUpload.bat %*
\ No newline at end of file
diff --git a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/sc_client/extra-files/global_bin/scancentral b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/sc_client/extra-files/global_bin/scancentral
deleted file mode 100644
index 7716e8f97e..0000000000
--- a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/sc_client/extra-files/global_bin/scancentral
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-{{binDir}}/scancentral "$@"
\ No newline at end of file
diff --git a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/sc_client/extra-files/global_bin/scancentral.bat b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/sc_client/extra-files/global_bin/scancentral.bat
deleted file mode 100644
index 2067571772..0000000000
--- a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/sc_client/extra-files/global_bin/scancentral.bat
+++ /dev/null
@@ -1 +0,0 @@
-{{binDir}}\scancentral.bat %*
\ No newline at end of file
diff --git a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln_exporter/extra-files/global_bin/FortifyVulnerabilityExporter b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln_exporter/extra-files/global_bin/FortifyVulnerabilityExporter
deleted file mode 100644
index 88973ec19b..0000000000
--- a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln_exporter/extra-files/global_bin/FortifyVulnerabilityExporter
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-{{binDir}}/FortifyVulnerabilityExporter "$@"
\ No newline at end of file
diff --git a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln_exporter/extra-files/global_bin/FortifyVulnerabilityExporter.bat b/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln_exporter/extra-files/global_bin/FortifyVulnerabilityExporter.bat
deleted file mode 100644
index 41e102303d..0000000000
--- a/fcli-core/fcli-tool/src/main/resources/com/fortify/cli/tool/vuln_exporter/extra-files/global_bin/FortifyVulnerabilityExporter.bat
+++ /dev/null
@@ -1 +0,0 @@
-{{binDir}}\FortifyVulnerabilityExporter.bat %*
\ No newline at end of file