Performing a VM EclipseIniTask should match prefixes more carefully

#182

Author: merks

plugins/org.eclipse.oomph.setup.core/META-INF/MANIFEST.MF

@@ -32,7 +32,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.24.0,4.0.0)",
  org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.oomph.base.edit;bundle-version="[1.18.0,2.0.0)",
  org.eclipse.oomph.p2.core;bundle-version="[1.33.0,2.0.0)",
- org.eclipse.oomph.setup;bundle-version="[1.32.0,2.0.0)";visibility:=reexport,
+ org.eclipse.oomph.setup;bundle-version="[1.33.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup.p2;bundle-version="[1.23.0,2.0.0)",
  org.eclipse.oomph.preferences;bundle-version="[1.15.0,2.0.0)",
  org.eclipse.core.net;bundle-version="[1.2.0,2.0.0)"

plugins/org.eclipse.oomph.setup.installer/META-INF/MANIFEST.MF

@@ -10,7 +10,7 @@ Bundle-Activator: org.eclipse.oomph.setup.internal.installer.SetupInstallerPlugi
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.24.0,4.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.10.0,3.0.0)",
- org.eclipse.oomph.setup;bundle-version="[1.32.0,2.0.0)",
+ org.eclipse.oomph.setup;bundle-version="[1.33.0,2.0.0)",
  org.eclipse.oomph.setup.edit;bundle-version="[1.19.0,2.0.0)",
  org.eclipse.oomph.setup.ui;bundle-version="[1.34.0,2.0.0)",
  org.eclipse.equinox.p2.operations;bundle-version="[2.0.0,3.0.0)",

plugins/org.eclipse.oomph.setup.jdt/META-INF/MANIFEST.MF

@@ -12,7 +12,7 @@ Export-Package: org.eclipse.oomph.setup.jdt;version="1.24.0";x-internal:=true,
  org.eclipse.oomph.setup.jdt.util;version="1.24.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.24.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.setup;bundle-version="[1.32.0,2.0.0)";visibility:=reexport,
+ org.eclipse.oomph.setup;bundle-version="[1.33.0,2.0.0)";visibility:=reexport,
  org.eclipse.jdt.launching;bundle-version="[3.6.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.oomph.setup.jdt

plugins/org.eclipse.oomph.setup.p2/META-INF/MANIFEST.MF

@@ -15,7 +15,7 @@ Export-Package: org.eclipse.oomph.setup.internal.p2;version="1.23.0";x-internal:
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.24.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
  org.eclipse.oomph.p2.core;bundle-version="[1.33.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.setup;bundle-version="[1.32.0,2.0.0)";visibility:=reexport,
+ org.eclipse.oomph.setup;bundle-version="[1.33.0,2.0.0)";visibility:=reexport,
  org.eclipse.equinox.p2.artifact.repository;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.equinox.p2.console;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.equinox.p2.core;bundle-version="[2.0.0,3.0.0)",

plugins/org.eclipse.oomph.setup/META-INF/MANIFEST.MF

@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.oomph.setup;singleton:=true
-Bundle-Version: 1.32.0.qualifier
+Bundle-Version: 1.33.0.qualifier
 Bundle-ClassPath: .
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
@@ -16,10 +16,10 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.24.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.oomph.internal.setup;version="1.32.0";x-internal:=true,
- org.eclipse.oomph.setup;version="1.32.0";x-internal:=true,
- org.eclipse.oomph.setup.impl;version="1.32.0";x-internal:=true,
- org.eclipse.oomph.setup.log;version="1.32.0";x-internal:=true,
- org.eclipse.oomph.setup.util;version="1.32.0";x-internal:=true
+Export-Package: org.eclipse.oomph.internal.setup;version="1.33.0";x-internal:=true,
+ org.eclipse.oomph.setup;version="1.33.0";x-internal:=true,
+ org.eclipse.oomph.setup.impl;version="1.33.0";x-internal:=true,
+ org.eclipse.oomph.setup.log;version="1.33.0";x-internal:=true,
+ org.eclipse.oomph.setup.util;version="1.33.0";x-internal:=true
 Bundle-Activator: org.eclipse.oomph.internal.setup.SetupPlugin$Implementation
 Automatic-Module-Name: org.eclipse.oomph.setup

plugins/org.eclipse.oomph.setup/pom.xml

@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.setup</artifactId>
-  <version>1.32.0-SNAPSHOT</version>
+  <version>1.33.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>

plugins/org.eclipse.oomph.setup/src/org/eclipse/oomph/setup/impl/EclipseIniTaskImpl.java

@@ -402,10 +402,11 @@ private boolean createNewContent(SetupTaskContext context)
       String line = option + (value == null ? "" : value); //$NON-NLS-1$
       if (vmargsIndex != -1)
       {
+        String optionPrefix = option + (value != null && value.startsWith("=") ? "=" : ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         for (int i = vmargsIndex + 1; i < contents.size(); i++)
         {
           String oldLine = contents.get(i);
-          if (oldLine.startsWith(option))
+          if (oldLine.startsWith(optionPrefix))
           {
             contents.set(i, line);
             line = null;