Refactor null checks for improved readability

Sntai20 · Sntai20 · commit 109306f62245 · 2025-03-03T12:25:53.000-08:00
Updated conditional checks in `install.ps1` to use `$null -ne variable` format. This change enhances code clarity and maintainability while preserving existing functionality. The modifications are applied consistently across multiple statements.
diff --git a/install.ps1 b/install.ps1
@@ -577,7 +577,7 @@ PreparingToExpandVerboseMessage=Preparing to expand...
 
                 foreach ($currentFilePath in $sourcePaths)
                 {
-                    if ($modifiedSourceDirFullName -ne $null -and $modifiedSourceDirFullName.Length -gt 0)
+                    if ($null -ne $modifiedSourceDirFullName -and $modifiedSourceDirFullName.Length -gt 0)
                     {
                         $index = $currentFilePath.IndexOf($modifiedSourceDirFullName, [System.StringComparison]::OrdinalIgnoreCase)
                         $currentFilePathSubString = $currentFilePath.Substring($index, $modifiedSourceDirFullName.Length)
@@ -608,7 +608,7 @@ PreparingToExpandVerboseMessage=Preparing to expand...
                             }
                         }
 
-                        if ($entryToBeUpdated -ne $null)
+                        if ($null -ne $entryToBeUpdated)
                         {
                             $addItemtoArchiveFileMessage = ($LocalizedData.AddItemtoArchiveFile -f $currentFilePath)
                             $entryToBeUpdated.Delete()
@@ -856,7 +856,7 @@ PreparingToExpandVerboseMessage=Preparing to expand...
                                 if ($force)
                                 {
                                     Remove-Item -LiteralPath $currentArchiveEntryFileInfo.FullName -Force -ErrorVariable ev -Verbose:$isVerbose -Confirm:$isConfirm
-                                    if ($ev -ne $null)
+                                    if ($null -ne $ev)
                                     {
                                         $hasNonTerminatingError = $true
                                     }
@@ -1033,7 +1033,7 @@ PreparingToExpandVerboseMessage=Preparing to expand...
                 $innerException
             )
 
-            if ($innerException -eq $null)
+            if ($null -eq $innerException)
             {
                 $exception = New-Object System.IO.IOException $errorMessage
             }
@@ -1723,7 +1723,7 @@ PreparingToExpandVerboseMessage=Preparing to expand...
 
                 foreach ($currentFilePath in $sourcePaths)
                 {
-                    if ($modifiedSourceDirFullName -ne $null -and $modifiedSourceDirFullName.Length -gt 0)
+                    if ($null -ne $modifiedSourceDirFullName -and $modifiedSourceDirFullName.Length -gt 0)
                     {
                         $index = $currentFilePath.IndexOf($modifiedSourceDirFullName, [System.StringComparison]::OrdinalIgnoreCase)
                         $currentFilePathSubString = $currentFilePath.Substring($index, $modifiedSourceDirFullName.Length)
@@ -1754,7 +1754,7 @@ PreparingToExpandVerboseMessage=Preparing to expand...
                             }
                         }
 
-                        if ($entryToBeUpdated -ne $null)
+                        if ($null -ne $entryToBeUpdated)
                         {
                             $addItemtoArchiveFileMessage = ($LocalizedData.AddItemtoArchiveFile -f $currentFilePath)
                             $entryToBeUpdated.Delete()
@@ -2002,7 +2002,7 @@ PreparingToExpandVerboseMessage=Preparing to expand...
                                 if ($force)
                                 {
                                     Remove-Item -LiteralPath $currentArchiveEntryFileInfo.FullName -Force -ErrorVariable ev -Verbose:$isVerbose -Confirm:$isConfirm
-                                    if ($ev -ne $null)
+                                    if ($null -ne $ev)
                                     {
                                         $hasNonTerminatingError = $true
                                     }
@@ -2179,7 +2179,7 @@ PreparingToExpandVerboseMessage=Preparing to expand...
                 $innerException
             )
 
-            if ($innerException -eq $null)
+            if ($null -eq $innerException)
             {
                 $exception = New-Object System.IO.IOException $errorMessage
             }
@@ -2259,7 +2259,7 @@ PreparingToExpandVerboseMessage=Preparing to expand...
             else
             {
                 $createdItem = New-Item -Path $DestinationPath -ItemType Directory -Confirm:$isConfirm -Verbose:$isVerbose -ErrorAction Stop
-                if ($createdItem -ne $null -and $createdItem.PSProvider.Name -ne "FileSystem")
+                if ($null -ne $createdItem -and $createdItem.PSProvider.Name -ne "FileSystem")
                 {
                     Remove-Item "$DestinationPath" -Force -Recurse -ErrorAction SilentlyContinue
                     $errorMessage = ($LocalizedData.ExpandArchiveInValidDestinationPath -f $DestinationPath)

Original file line number	Diff line number	Diff line change
`@@ -577,7 +577,7 @@ PreparingToExpandVerboseMessage=Preparing to expand...`
`577`	`577`
`578`	`578`	`foreach ($currentFilePath in $sourcePaths)`
`579`	`579`	`{`
`580`		`- if ($modifiedSourceDirFullName -ne $null -and $modifiedSourceDirFullName.Length -gt 0)`
	`580`	`+ if ($null -ne $modifiedSourceDirFullName -and $modifiedSourceDirFullName.Length -gt 0)`
`581`	`581`	`{`
`582`	`582`	`$index = $currentFilePath.IndexOf($modifiedSourceDirFullName, [System.StringComparison]::OrdinalIgnoreCase)`
`583`	`583`	`$currentFilePathSubString = $currentFilePath.Substring($index, $modifiedSourceDirFullName.Length)`
`@@ -608,7 +608,7 @@ PreparingToExpandVerboseMessage=Preparing to expand...`
`608`	`608`	`}`
`609`	`609`	`}`
`610`	`610`
`611`		`- if ($entryToBeUpdated -ne $null)`
	`611`	`+ if ($null -ne $entryToBeUpdated)`
`612`	`612`	`{`
`613`	`613`	`$addItemtoArchiveFileMessage = ($LocalizedData.AddItemtoArchiveFile -f $currentFilePath)`
`614`	`614`	`$entryToBeUpdated.Delete()`
`@@ -856,7 +856,7 @@ PreparingToExpandVerboseMessage=Preparing to expand...`
`856`	`856`	`if ($force)`
`857`	`857`	`{`
`858`	`858`	`Remove-Item -LiteralPath $currentArchiveEntryFileInfo.FullName -Force -ErrorVariable ev -Verbose:$isVerbose -Confirm:$isConfirm`
`859`		`- if ($ev -ne $null)`
	`859`	`+ if ($null -ne $ev)`
`860`	`860`	`{`
`861`	`861`	`$hasNonTerminatingError = $true`
`862`	`862`	`}`
`@@ -1033,7 +1033,7 @@ PreparingToExpandVerboseMessage=Preparing to expand...`
`1033`	`1033`	`$innerException`
`1034`	`1034`	`)`
`1035`	`1035`
`1036`		`- if ($innerException -eq $null)`
	`1036`	`+ if ($null -eq $innerException)`
`1037`	`1037`	`{`
`1038`	`1038`	`$exception = New-Object System.IO.IOException $errorMessage`
`1039`	`1039`	`}`
`@@ -1723,7 +1723,7 @@ PreparingToExpandVerboseMessage=Preparing to expand...`
`1723`	`1723`
`1724`	`1724`	`foreach ($currentFilePath in $sourcePaths)`
`1725`	`1725`	`{`
`1726`		`- if ($modifiedSourceDirFullName -ne $null -and $modifiedSourceDirFullName.Length -gt 0)`
	`1726`	`+ if ($null -ne $modifiedSourceDirFullName -and $modifiedSourceDirFullName.Length -gt 0)`
`1727`	`1727`	`{`
`1728`	`1728`	`$index = $currentFilePath.IndexOf($modifiedSourceDirFullName, [System.StringComparison]::OrdinalIgnoreCase)`
`1729`	`1729`	`$currentFilePathSubString = $currentFilePath.Substring($index, $modifiedSourceDirFullName.Length)`
`@@ -1754,7 +1754,7 @@ PreparingToExpandVerboseMessage=Preparing to expand...`
`1754`	`1754`	`}`
`1755`	`1755`	`}`
`1756`	`1756`
`1757`		`- if ($entryToBeUpdated -ne $null)`
	`1757`	`+ if ($null -ne $entryToBeUpdated)`
`1758`	`1758`	`{`
`1759`	`1759`	`$addItemtoArchiveFileMessage = ($LocalizedData.AddItemtoArchiveFile -f $currentFilePath)`
`1760`	`1760`	`$entryToBeUpdated.Delete()`
`@@ -2002,7 +2002,7 @@ PreparingToExpandVerboseMessage=Preparing to expand...`
`2002`	`2002`	`if ($force)`
`2003`	`2003`	`{`
`2004`	`2004`	`Remove-Item -LiteralPath $currentArchiveEntryFileInfo.FullName -Force -ErrorVariable ev -Verbose:$isVerbose -Confirm:$isConfirm`
`2005`		`- if ($ev -ne $null)`
	`2005`	`+ if ($null -ne $ev)`
`2006`	`2006`	`{`
`2007`	`2007`	`$hasNonTerminatingError = $true`
`2008`	`2008`	`}`
`@@ -2179,7 +2179,7 @@ PreparingToExpandVerboseMessage=Preparing to expand...`
`2179`	`2179`	`$innerException`
`2180`	`2180`	`)`
`2181`	`2181`
`2182`		`- if ($innerException -eq $null)`
	`2182`	`+ if ($null -eq $innerException)`
`2183`	`2183`	`{`
`2184`	`2184`	`$exception = New-Object System.IO.IOException $errorMessage`
`2185`	`2185`	`}`
`@@ -2259,7 +2259,7 @@ PreparingToExpandVerboseMessage=Preparing to expand...`
`2259`	`2259`	`else`
`2260`	`2260`	`{`
`2261`	`2261`	`$createdItem = New-Item -Path $DestinationPath -ItemType Directory -Confirm:$isConfirm -Verbose:$isVerbose -ErrorAction Stop`
`2262`		`- if ($createdItem -ne $null -and $createdItem.PSProvider.Name -ne "FileSystem")`
	`2262`	`+ if ($null -ne $createdItem -and $createdItem.PSProvider.Name -ne "FileSystem")`
`2263`	`2263`	`{`
`2264`	`2264`	`Remove-Item "$DestinationPath" -Force -Recurse -ErrorAction SilentlyContinue`
`2265`	`2265`	`$errorMessage = ($LocalizedData.ExpandArchiveInValidDestinationPath -f $DestinationPath)`