mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

bootstrap

Browse source
This commit is contained in:
Piotr Puszkiewicz 2016-03-18 02:31:03 -07:00
parent aa989f1e6e
commit 04adb5ef56
2 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/dotnet-cli-build/InstallerTargets.cs
View file

@ -14,7 +14,7 @@ namespace Microsoft.DotNet.Cli.Build
{ {
[Target(nameof(MsiTargets.GenerateMsis), [Target(nameof(MsiTargets.GenerateMsis),
nameof(MsiTargets.GenerateBundle), nameof(MsiTargets.GenerateBundle),
nameof(PkgTargets.GeneratePkgs)]//, nameof(PkgTargets.GeneratePkgs))]//,
//nameof(InstallerTargets.GenerateDebs))] //nameof(InstallerTargets.GenerateDebs))]
public static BuildTargetResult GenerateInstaller(BuildTargetContext c) public static BuildTargetResult GenerateInstaller(BuildTargetContext c)
{ {

18
scripts/obtain/install.sh
View file

@ -99,6 +99,16 @@ make_link() {
ln -s $src $dest ln -s $src $dest
} }
make_bootstrap_link() {
local src=$INSTALLDIR/cli/bin/dotnet
local dest=$INSTALLDIR/cli/dotnet
say "Linking $dest -> $src"
if [ -e $dest ]; then
rm $dest
fi
ln -s $src $dest
}
install_dotnet() install_dotnet()
{ {
if ! machine_has "curl"; then if ! machine_has "curl"; then
@ -130,6 +140,10 @@ install_dotnet()
local installLocation="$INSTALLDIR" local installLocation="$INSTALLDIR"
local dotnet_url="https://dotnetcli.blob.core.windows.net/dotnet/$CHANNEL/Binaries/$VERSION" local dotnet_url="https://dotnetcli.blob.core.windows.net/dotnet/$CHANNEL/Binaries/$VERSION"
local dotnet_filename="dotnet-dev-$os-x64.$fileVersion.tar.gz" local dotnet_filename="dotnet-dev-$os-x64.$fileVersion.tar.gz"
if [ "$os" = "ubuntu" ]; then
dotnet_filename="dotnet-$os-x64.$fileVersion.tar.gz"
fi
if [ "$RELINK" = "0" ]; then if [ "$RELINK" = "0" ]; then
if [ "$FORCE" = "0" ]; then if [ "$FORCE" = "0" ]; then
@ -178,6 +192,10 @@ install_dotnet()
[ $? != 0 ] && say_err "Failed to clean current dotnet install" && return 1 [ $? != 0 ] && say_err "Failed to clean current dotnet install" && return 1
mv "$installLocation/cli_new" "$installLocation/cli" mv "$installLocation/cli_new" "$installLocation/cli"
if [ "$os" = "ubuntu" ]; then
make_bootstrap_link
fi
elif [ ! -e "$installLocation/cli" ]; then elif [ ! -e "$installLocation/cli" ]; then
say_err "${red}cannot relink dotnet, it is not installed in $PREFIX!" say_err "${red}cannot relink dotnet, it is not installed in $PREFIX!"
return 1 return 1