File tree 2 files changed +6
-3
lines changed
2 files changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -34,7 +34,7 @@ if($is32)
34
34
if ($pp [' installdir' ]) {
35
35
$binRoot = $pp [' installdir' ]
36
36
} else {
37
- $binRoot = $ ( Split-Path - parent $MyInvocation .MyCommand.Definition )
37
+ $binRoot = Get-ToolsLocation
38
38
}
39
39
$packageFullName = Join-Path $binRoot ($packageName + ' -' + $version )
40
40
$binPackageDir = Join-Path $packageFullName " bin"
@@ -56,6 +56,7 @@ rm $tmpFile # Clean up temporary file
56
56
$longBinPackageDir = Join-Path $binRoot $baseTarget
57
57
if (Test-Path $longBinPackageDir ) {
58
58
Rename-Item - fo $longBinPackageDir $packageFullName
59
+ Write-Host " Renamed $longBinPackageDir to $packageFullName "
59
60
}
60
61
61
62
# FIxes issue #8
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ $is32 = (Get-OSArchitectureWidth 32) -or $env:chocolateyForceX86 -eq 'true'
17
17
if ($pp [' installdir' ]) {
18
18
$binRoot = $pp [' installdir' ]
19
19
} else {
20
- $binRoot = $ ( Split-Path - parent $MyInvocation .MyCommand.Definition )
20
+ $binRoot = Get-ToolsLocation
21
21
}
22
22
$packageFullName = Join-Path $binRoot ($packageName + ' -' + $version )
23
23
$binPackageDir = Join-Path $packageFullName " bin"
@@ -31,4 +31,6 @@ if (-Not $is32) {
31
31
Uninstall-BinFile " ghc-$version "
32
32
Uninstall-BinFile " ghci-$version "
33
33
Uninstall-BinFile " haddock-$version "
34
- }
34
+ }
35
+
36
+ Remove-Item - Force - Recurse $packageFullName
You can’t perform that action at this time.
0 commit comments