File tree Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
1515export DOTNET_MULTILEVEL_LOOKUP=0
1616export NUGET_PACKAGES=" $SCRIPT_ROOT /packages/"
1717
18- " $SCRIPT_ROOT /init-tools.sh"
18+ source " $SCRIPT_ROOT /init-tools.sh"
1919
2020CLIPATH=" $SCRIPT_ROOT /Tools/dotnetcli"
2121SDKPATH=" $CLIPATH /sdk/$SDK_VERSION "
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ __PACKAGES_DIR=$__scriptpath/packages
66__TOOLRUNTIME_DIR=$__scriptpath /Tools
77__DOTNET_PATH=$__TOOLRUNTIME_DIR /dotnetcli
88__DOTNET_CMD=$__DOTNET_PATH /dotnet
9- if [ -z " $__BUILDTOOLS_SOURCE " ]; then __BUILDTOOLS_SOURCE=https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json; fi
9+ if [ -z " ${ __BUILDTOOLS_SOURCE:- } " ]; then __BUILDTOOLS_SOURCE=https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json; fi
1010export __BUILDTOOLS_USE_CSPROJ=true
1111__BUILD_TOOLS_PACKAGE_VERSION=$( cat $__scriptpath /BuildToolsVersion.txt)
1212__DOTNET_TOOLS_VERSION=$( cat $__scriptpath /DotnetCLIVersion.txt)
2121
2222if [ -e $__TOOLRUNTIME_DIR ]; then rm -rf -- $__TOOLRUNTIME_DIR ; fi
2323
24- if [ -d " $DotNetBuildToolsDir " ]; then
24+ if [ -d " ${ DotNetBuildToolsDir:- } " ]; then
2525 echo " Using tools from '$DotNetBuildToolsDir '."
2626 ln -s " $DotNetBuildToolsDir " " $__TOOLRUNTIME_DIR "
2727
3838echo " Running: $__scriptpath /init-tools.sh" > $__init_tools_log
3939
4040if [ ! -e $__DOTNET_PATH ]; then
41- if [ -z " $__DOTNET_PKG " ]; then
41+ if [ -z " ${ __DOTNET_PKG:- } " ]; then
4242 if [ " $( uname -m | grep " i[3456]86" ) " = " i686" ]; then
4343 echo " Warning: build not supported on 32 bit Unix"
4444 fi
You can’t perform that action at this time.
0 commit comments