Update rustup manifest to use new installer and uninstaller script block syntax.

This commit is contained in:
Matthew J. Berger 2017-08-22 09:29:03 -07:00
parent 024cb86051
commit e0f289e063

View File

@ -13,14 +13,6 @@
".cargo", ".cargo",
".rustup" ".rustup"
], ],
"pre_install": "
# Create the installation script
echo '& \"$dir\\rustup-init.exe\" -y --no-modify-path' | out-file $dir\\install-rustup.ps1
# Create the uninstallation script to remove the environment variables that were set
echo '[Environment]::SetEnvironmentVariable(\"RUSTUP_HOME\",$null,\"User\")' | out-file $dir\\uninstall-rustup.ps1
echo '[Environment]::SetEnvironmentVariable(\"CARGO_HOME\",$null,\"User\")' | out-file $dir\\uninstall-rustup.ps1 -append
",
"post_install": " "post_install": "
# Copy the installed cargo directory to the rustup persistent data directory # Copy the installed cargo directory to the rustup persistent data directory
$cargoFolder = \"$env:USERPROFILE\\.cargo\" $cargoFolder = \"$env:USERPROFILE\\.cargo\"
@ -45,14 +37,15 @@
if(Test-Path $rustupFolderDestination) if(Test-Path $rustupFolderDestination)
{ {
Write-Host -F yellow \"Removing existing .rustup folder from scoop's persistent rustup data directory.\" Write-Host -F yellow \"Removing existing .rustup folder from scoop's persistent rustup data directory.\"
Remove-Item -Recurse $rustupFolderDestination [System.IO.Directory]::Delete($rustupFolderDestination,$true)
} }
Write-Host -F yellow \"Moving '$rustupFolder' to '$persist_dir'\" Write-Host -F yellow \"Moving '$rustupFolder' to '$persist_dir'\"
Move-Item -Force \"$rustupFolder\" \"$persist_dir\" Move-Item -Force \"$rustupFolder\" \"$persist_dir\"
if(Test-Path $multirustShortcut) if(Test-Path $multirustShortcut)
{ {
Write-Host -F yellow \"Removing old multirust junction.\" Write-Host -F yellow \"Removing old multirust junction.\"
Remove-Item -Force $multirustShortcut [System.IO.Directory]::Delete($multirustShortcut,$true)
} }
} }
", ",
@ -63,9 +56,14 @@
}, },
"notes": "You'll need to restart powershell/cmd to have it reload the environment variables so rustup will work correctly", "notes": "You'll need to restart powershell/cmd to have it reload the environment variables so rustup will work correctly",
"installer": { "installer": {
"file": "install-rustup.ps1" "script": "
& \"$dir\\rustup-init.exe\" -y --no-modify-path
"
}, },
"uninstaller": { "uninstaller": {
"file": "uninstall-rustup.ps1" "script": "
[Environment]::SetEnvironmentVariable('RUSTUP_HOME',$null,'User')
[Environment]::SetEnvironmentVariable('CARGO_HOME',$null,'User')
"
} }
} }