Fixed install-dir as argument to the Robocode command-line and made it possible to specify a \InstallDir parameter as well for the Chocolatey install script.

Author: flemming-n-larsen

robocode.installer/build.gradle.kts

@@ -105,12 +105,7 @@ tasks {
     task<Exec>("chocoBuild") {
         dependsOn("chocoCopy")
         workingDir = file("build/choco")
-        doFirst {
-            commandLine("choco", "pack", "--version", "${project.version}", "--skipautouninstaller")
-        }
-        doLast {
-            delete("build/choco/tools/chocolateyuninstall.ps1") // should be omitted from the package (moderation)
-        }
+        commandLine("choco", "pack", "--version", "${project.version}")
     }
 
     task<Exec>("chocoPush") {

robocode.installer/src/chocolatey/tools/VERIFICATION.txt

@@ -17,7 +17,7 @@ VERIFYING CHECKSUM CONTENT
 
 3. Verify that checksum is:
 
-   759A37C34B18EB6BD3B54B7FD4579F0F23451A48B32614868FA48DABBFFD41F1
+   42B45FA86538009DA0CF3151A520A111610E055967143D1A17B6BF150707C043
 
 
 VERIFYING LICENCE

robocode.installer/src/chocolatey/tools/chocolateyinstall.ps1

@@ -1,4 +1,7 @@
 $ErrorActionPreference = 'Stop';
-$toolsDir   = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
-# Get-ChocolateyUnzip -FileFullPath  "$(Split-Path -Parent $MyInvocation.MyCommand.Definition)\\robocode-*-setup.jar" -Destination "C:\robocode"
-Start-ChocolateyProcessAsAdmin -Statements "java -jar $(Split-Path -Parent $MyInvocation.MyCommand.Definition)\robocode-$env:ChocolateyPackageVersion-setup.jar C:\robocode\ silent"
+$toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
+
+$params = Get-PackageParameters
+if (!$params['InstallDir']) { $params['InstallDir'] = "$env:SystemDrive\Robocode" }
+
+Start-ChocolateyProcessAsAdmin -Statements "java -jar $(Split-Path -Parent $MyInvocation.MyCommand.Definition)\robocode-$env:ChocolateyPackageVersion-setup.jar $($params['InstallDir']) silent"

robocode.installer/src/chocolatey/tools/chocolateyuninstall.ps1

@@ -324,17 +324,16 @@ private boolean extract(File installDir) {
 
     public static void main(String[] argv) {
         String suggestedDirName;
-        if (argv.length == 1) {
+        if (argv.length >= 1) {
             suggestedDirName = argv[0];
         } else if (isWindowsOS()) {
-            suggestedDirName = "C:\\robocode\\";
+            suggestedDirName = System.getenv("SystemDrive") + ":\\robocode";
         } else {
             suggestedDirName = System.getProperty("user.home") + File.separator + "robocode" + File.separator;
         }
-        if (argv.length >= 1 && "silent".equals(argv[1])) {
+        if (argv.length >= 2 && "silent".equals(argv[1])) {
             isSilent = true;
-        }
-        else if (GraphicsEnvironment.isHeadless()) {
+        } else if (GraphicsEnvironment.isHeadless()) {
             isSilent = true;
         }