Update some files
This commit is contained in:
parent
b9a1706734
commit
a3498fa5a2
|
|
@ -33,7 +33,7 @@ if (Test-Path $LocalFile)
|
||||||
if ($LocalVersion -and $LocalHash)
|
if ($LocalVersion -and $LocalHash)
|
||||||
{
|
{
|
||||||
$RemoteResponse = Invoke-WebRequest -UseBasicParsing "$Feed/$Channel/dnvm/latest.win.version"
|
$RemoteResponse = Invoke-WebRequest -UseBasicParsing "$Feed/$Channel/dnvm/latest.win.version"
|
||||||
$RemoteData = @([Text.Encoding]::UTF8.GetString($RemoteResponse.Content).Split());
|
$RemoteData = @([Text.Encoding]::UTF8.GetString($RemoteResponse.Content).Split([char[]]@(), [StringSplitOptions]::RemoveEmptyEntries));
|
||||||
$RemoteHash = $RemoteData[0].Trim()
|
$RemoteHash = $RemoteData[0].Trim()
|
||||||
$RemoteVersion = $RemoteData[1].Trim()
|
$RemoteVersion = $RemoteData[1].Trim()
|
||||||
|
|
||||||
|
|
@ -88,4 +88,4 @@ if (Test-Path "$InstallDir\$DotNetFileName") {
|
||||||
say "The .NET Tools have been installed to $InstallDir\cli!"
|
say "The .NET Tools have been installed to $InstallDir\cli!"
|
||||||
|
|
||||||
# New layout
|
# New layout
|
||||||
say "Add '$InstallDir\cli\bin' to your PATH to use dotnet"
|
say "Add '$InstallDir\cli\bin' to your PATH to use dotnet"
|
||||||
|
|
@ -16,7 +16,7 @@ SOURCE="${BASH_SOURCE[0]}"
|
||||||
while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
|
while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
|
||||||
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
|
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
|
||||||
SOURCE="$(readlink "$SOURCE")"
|
SOURCE="$(readlink "$SOURCE")"
|
||||||
[[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
|
[[ "$SOURCE" != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
|
||||||
done
|
done
|
||||||
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
|
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
|
||||||
|
|
||||||
|
|
@ -87,7 +87,12 @@ current_os()
|
||||||
if [ "$uname" = "Darwin" ]; then
|
if [ "$uname" = "Darwin" ]; then
|
||||||
echo "osx"
|
echo "osx"
|
||||||
else
|
else
|
||||||
echo "linux"
|
# Detect Distro
|
||||||
|
if [ "$(cat /etc/*-release | grep -cim1 ubuntu)" -eq 1 ]; then
|
||||||
|
echo "ubuntu"
|
||||||
|
elif [ "$(cat /etc/*-release | grep -cim1 centos)" -eq 1 ]; then
|
||||||
|
echo "centos"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -107,7 +112,7 @@ check_pre_reqs() {
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$os" = "linux" ]; then
|
if [ "$(uname)" = "Linux" ]; then
|
||||||
[ -z "$(ldconfig -p | grep libunwind)" ] && say_err "Unable to locate libunwind. Install libunwind to continue" && _failing=true
|
[ -z "$(ldconfig -p | grep libunwind)" ] && say_err "Unable to locate libunwind. Install libunwind to continue" && _failing=true
|
||||||
[ -z "$(ldconfig -p | grep libssl)" ] && say_err "Unable to locate libssl. Install libssl to continue" && _failing=true
|
[ -z "$(ldconfig -p | grep libssl)" ] && say_err "Unable to locate libssl. Install libssl to continue" && _failing=true
|
||||||
[ -z "$(ldconfig -p | grep libcurl)" ] && say_err "Unable to locate libcurl. Install libcurl to continue" && _failing=true
|
[ -z "$(ldconfig -p | grep libcurl)" ] && say_err "Unable to locate libcurl. Install libcurl to continue" && _failing=true
|
||||||
|
|
@ -259,4 +264,4 @@ do
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
|
|
||||||
install_dotnet
|
install_dotnet
|
||||||
|
|
@ -0,0 +1,20 @@
|
||||||
|
language: csharp
|
||||||
|
sudo: required
|
||||||
|
dist: trusty
|
||||||
|
addons:
|
||||||
|
apt:
|
||||||
|
packages:
|
||||||
|
- gettext
|
||||||
|
- libcurl4-openssl-dev
|
||||||
|
- libicu-dev
|
||||||
|
- libssl-dev
|
||||||
|
- libunwind8
|
||||||
|
- zlib1g
|
||||||
|
mono:
|
||||||
|
- 4.0.5
|
||||||
|
os:
|
||||||
|
- linux
|
||||||
|
- osx
|
||||||
|
osx_image: xcode7.1
|
||||||
|
script:
|
||||||
|
- ./build.sh verify
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
init:
|
||||||
|
- git config --global core.autocrlf true
|
||||||
|
build_script:
|
||||||
|
- build.cmd verify
|
||||||
|
clone_depth: 1
|
||||||
|
test: off
|
||||||
|
deploy: off
|
||||||
Loading…
Reference in New Issue