lee/Scoop
1
0
Fork 0
mirror of https://github.com/ScoopInstaller/Scoop.git synced 2025-12-04 07:05:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(current): Remove 'current' while it's not a junction (#4687)

Browse Source
This commit is contained in:
Hsiao-nan Cheung
2022-01-26 01:41:15 +08:00
committed by GitHub
parent 98ea7a5e82
commit 4a9efaa2d9
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/install.ps1
View File

@@ -911,20 +911,20 @@ function current_dir($versiondir) {
# Returns the 'current' junction directory if in use, otherwise
# the version directory.
function link_current($versiondir) {
if(get_config NO_JUNCTIONS) { return $versiondir }
if (get_config NO_JUNCTIONS) { return $versiondir }
$currentdir = current_dir $versiondir
write-host "Linking $(friendly_path $currentdir) => $(friendly_path $versiondir)"
Write-Host "Linking $(friendly_path $currentdir) => $(friendly_path $versiondir)"
if($currentdir -eq $versiondir) {
if ($currentdir -eq $versiondir) {
abort "Error: Version 'current' is not allowed!"
}
if(test-path $currentdir) {
if (Test-Path $currentdir) {
# remove the junction
attrib -R /L $currentdir
& "$env:COMSPEC" /c rmdir $currentdir
Remove-Item $currentdir -Recurse -Force -ErrorAction Stop
}
New-Item -Path $currentdir -ItemType Junction -Value $versiondir | Out-Null
@@ -938,17 +938,17 @@ function link_current($versiondir) {
# Returns the 'current' junction directory (if it exists),
# otherwise the normal version directory.
function unlink_current($versiondir) {
if(get_config NO_JUNCTIONS) { return $versiondir }
if (get_config NO_JUNCTIONS) { return $versiondir }
$currentdir = current_dir $versiondir
if(test-path $currentdir) {
write-host "Unlinking $(friendly_path $currentdir)"
if (Test-Path $currentdir) {
Write-Host "Unlinking $(friendly_path $currentdir)"
# remove read-only attribute on link
attrib $currentdir -R /L
# remove the junction
& "$env:COMSPEC" /c "rmdir `"$currentdir`""
Remove-Item $currentdir -Recurse -Force -ErrorAction Stop
return $currentdir
}
return $versiondir