fix: Skip migration if '$scoopConfig' is NULL

Signed-off-by: Hsiao-nan Cheung <niheaven@gmail.com>
ScoopInstaller · Aug 20, 2022 · f9a092e · f9a092e
1 parent e4f8799
commit f9a092e
Showing 1 changed file with 22 additions and 20 deletions.
diff --git a/lib/core.ps1 b/lib/core.ps1
@@ -1205,26 +1205,28 @@ $configFile = "$configHome\scoop\config.json"
 $scoopConfig = load_cfg $configFile
 
 # NOTE Scoop config file migration. Remove this after 2023/6/30
-$newConfigNames = @{
-    'lastupdate'               = 'last_update'
-    'SCOOP_REPO'               = 'scoop_repo'
-    'SCOOP_BRANCH'             = 'scoop_branch'
-    '7ZIPEXTRACT_USE_EXTERNAL' = 'use_external_7zip'
-    'MSIEXTRACT_USE_LESSMSI'   = 'use_lessmsi'
-    'NO_JUNCTIONS'             = 'no_junction'
-    'manifest_review'          = 'show_manifest'
-    'rootPath'                 = 'root_path'
-    'globalPath'               = 'global_path'
-    'cachePath'                = 'cache_path'
-}
-$newConfigNames.GetEnumerator() | ForEach-Object {
-    if ($null -ne $scoopConfig.$($_.Key)) {
-        $value = $scoopConfig.$($_.Key)
-        $scoopConfig.PSObject.Properties.Remove($_.Key)
-        $scoopConfig | Add-Member -MemberType NoteProperty -Name $_.Value -Value $value
-    }
-}
-ConvertTo-Json $scoopConfig | Out-UTF8File -FilePath $configFile
+if ($scoopConfig) {
+    $newConfigNames = @{
+        'lastupdate'               = 'last_update'
+        'SCOOP_REPO'               = 'scoop_repo'
+        'SCOOP_BRANCH'             = 'scoop_branch'
+        '7ZIPEXTRACT_USE_EXTERNAL' = 'use_external_7zip'
+        'MSIEXTRACT_USE_LESSMSI'   = 'use_lessmsi'
+        'NO_JUNCTIONS'             = 'no_junction'
+        'manifest_review'          = 'show_manifest'
+        'rootPath'                 = 'root_path'
+        'globalPath'               = 'global_path'
+        'cachePath'                = 'cache_path'
+    }
+    $newConfigNames.GetEnumerator() | ForEach-Object {
+        if ($null -ne $scoopConfig.$($_.Key)) {
+            $value = $scoopConfig.$($_.Key)
+            $scoopConfig.PSObject.Properties.Remove($_.Key)
+            $scoopConfig | Add-Member -MemberType NoteProperty -Name $_.Value -Value $value
+        }
+    }
+    ConvertTo-Json $scoopConfig | Out-UTF8File -FilePath $configFile
+}
 # END NOTE
 
 # Scoop root directory