Skip to content

Commit

Permalink
fix(psmodules): Remove folder recursively when unlinking previous mod…
Browse files Browse the repository at this point in the history
…ule path (#5127)

* Update psmodules.ps1

* Update CHANGELOG.md

* Update CHANGELOG.md [skip ci]

Co-authored-by: Hsiao-nan Cheung <[email protected]>
  • Loading branch information
AkariiinMKII and niheaven authored Aug 29, 2022
1 parent e06c7f0 commit 740322f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
### Bug Fixes

- **config:** Change config option to snake_case in file and SCREAMING_CASE in code ([#5116](https://github.com/ScoopInstaller/Scoop/issues/5116))
- **psmodule:** Remove folder recursively when unlinking previous module path ([#5127](https://github.com/ScoopInstaller/Scoop/issues/5127))

### Code Refactoring

Expand Down
4 changes: 2 additions & 2 deletions lib/psmodules.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function install_psmodule($manifest, $dir, $global) {

if (Test-Path $linkfrom) {
warn "$(friendly_path $linkfrom) already exists. It will be replaced."
Remove-Item -Path $linkfrom -Force -ErrorAction SilentlyContinue
Remove-Item -Path $linkfrom -Force -Recurse -ErrorAction SilentlyContinue
}

New-DirectoryJunction $linkfrom $dir | Out-Null
Expand All @@ -40,7 +40,7 @@ function uninstall_psmodule($manifest, $dir, $global) {
if (Test-Path $linkfrom) {
Write-Host "Removing $(friendly_path $linkfrom)"
$linkfrom = Convert-Path $linkfrom
Remove-Item -Path $linkfrom -Force -ErrorAction SilentlyContinue
Remove-Item -Path $linkfrom -Force -Recurse -ErrorAction SilentlyContinue
}
}

Expand Down

0 comments on commit 740322f

Please sign in to comment.