fix(cleanup): Hotfix for ScoopInstaller#4681 (ScoopInstaller#4763)

niheaven · se35710 · commit c271f2eb94e0 · 2022-03-08T12:00:58.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -40,7 +40,7 @@
 
 ### Performance Improvements
 
-- **uninstall:** Avoid checking all files for unlinking persisted data ([#4681](https://github.com/ScoopInstaller/Scoop/issues/4681))
+- **uninstall:** Avoid checking all files for unlinking persisted data ([#4681](https://github.com/ScoopInstaller/Scoop/issues/4681), [#4763](https://github.com/ScoopInstaller/Scoop/issues/4763))
 
 ### Code Refactoring
 
diff --git a/libexec/scoop-cleanup.ps1 b/libexec/scoop-cleanup.ps1
@@ -49,7 +49,7 @@ function cleanup($app, $global, $verbose, $cache) {
         Write-Host " $version" -NoNewline
         $dir = versiondir $app $version $global
         # unlink all potential old link before doing recursive Remove-Item
-        unlink_persist_data $manifest $dir
+        unlink_persist_data (installed_manifest $app $version $global) $dir
         Remove-Item $dir -ErrorAction Stop -Recurse -Force
     }
     $leftVersions = Get-ChildItem $appDir

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ function cleanup($app, $global, $verbose, $cache) {`
`49`	`49`	`Write-Host " $version" -NoNewline`
`50`	`50`	`$dir = versiondir $app $version $global`
`51`	`51`	`# unlink all potential old link before doing recursive Remove-Item`
`52`		`- unlink_persist_data $manifest $dir`
	`52`	`+ unlink_persist_data (installed_manifest $app $version $global) $dir`
`53`	`53`	`Remove-Item $dir -ErrorAction Stop -Recurse -Force`
`54`	`54`	`}`
`55`	`55`	`$leftVersions = Get-ChildItem $appDir`