Update some files

This commit is contained in:
Victor Hurdugaci 2016-01-04 15:51:25 -08:00
parent b9a1706734
commit a3498fa5a2
4 changed files with 38 additions and 6 deletions

View File

@ -33,7 +33,7 @@ if (Test-Path $LocalFile)
if ($LocalVersion -and $LocalHash)
{
$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()
$RemoteVersion = $RemoteData[1].Trim()
@ -88,4 +88,4 @@ if (Test-Path "$InstallDir\$DotNetFileName") {
say "The .NET Tools have been installed to $InstallDir\cli!"
# New layout
say "Add '$InstallDir\cli\bin' to your PATH to use dotnet"
say "Add '$InstallDir\cli\bin' to your PATH to use dotnet"

View File

@ -16,7 +16,7 @@ SOURCE="${BASH_SOURCE[0]}"
while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
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
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
@ -87,7 +87,12 @@ current_os()
if [ "$uname" = "Darwin" ]; then
echo "osx"
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
}
@ -107,7 +112,7 @@ check_pre_reqs() {
return 0
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 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
@ -259,4 +264,4 @@ do
shift
done
install_dotnet
install_dotnet

View File

@ -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

View File

@ -0,0 +1,7 @@
init:
- git config --global core.autocrlf true
build_script:
- build.cmd verify
clone_depth: 1
test: off
deploy: off