Merge pull request #8242 from spacecowboy/3.0-powershellcontains

Fixed `neo4j install-service` on Windows 7
neo4j · Nov 1, 2016 · 89e608f · 89e608f
2 parents d96ba3b + e3ec926
commit 89e608f
Showing 1 changed file with 14 additions and 19 deletions.
diff --git a/...lone/src/main/distribution/shell-scripts/bin/Neo4j-Management/Merge-Neo4jJavaSettings.ps1 b/...lone/src/main/distribution/shell-scripts/bin/Neo4j-Management/Merge-Neo4jJavaSettings.ps1
@@ -65,31 +65,26 @@ Function Merge-Neo4jJavaSettings
 
   $Additional | ForEach-Object -Process {
     $thisSetting = $_
-    If (-not $Source.contains($thisSetting)) {
-      if ($matches -ne $null) { $matches.Clear() }
-      if ($thisSetting -match $SettingNameRegEx) {
-        $thisSettingName = $matches[1]
+    if ($matches -ne $null) { $matches.Clear() }
+    if ($thisSetting -match $SettingNameRegEx) {
+      $thisSettingName = $matches[1]
 
-        $oldValue = $null
-        $SettingOutput.GetEnumerator() | ForEach-Object -Process {
-          if ($_.Value -eq $thisSettingName) { $oldValue = $_.Key}
-        }
+      $oldValue = $null
+      $SettingOutput.GetEnumerator() | ForEach-Object -Process {
+        if ($_.Value -eq $thisSettingName) { $oldValue = $_.Key}
+      }
 
-        if ($oldValue -eq $null) {
-          Write-Verbose "Adding '$thisSetting'"
-          $SettingOutput.Add($thisSetting,'')
-        } else {
-          Write-Verbose "Merging '$thisSetting'"
-          $SettingOutput.Remove($oldValue)
-          $SettingOutput.Add($thisSetting,$thisSettingName)
-        }
-      } else {
+      if ($oldValue -eq $null) {
         Write-Verbose "Adding '$thisSetting'"
         $SettingOutput.Add($thisSetting,'')
+      } else {
+        Write-Verbose "Merging '$thisSetting'"
+        $SettingOutput.Remove($oldValue)
+        $SettingOutput.Add($thisSetting,$thisSettingName)
       }
-
     } else {
-      Write-Verbose "Ignoring '$thisSetting' as it is already defined"
+      Write-Verbose "Adding '$thisSetting'"
+      $SettingOutput.Add($thisSetting,'')
     }
   }