diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-05-19 15:22:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-19 15:22:44 -0700 |
| commit | 00434687ebfc70124795edd504e183df3ebe585c (patch) | |
| tree | 98fe74684b7c95387560ae96339daede0a0a8001 /scripts/bootstrap.sh | |
| parent | ec2b59b93e168d4f25f1935afb86f038b0122938 (diff) | |
| download | vcpkg-00434687ebfc70124795edd504e183df3ebe585c.tar.gz vcpkg-00434687ebfc70124795edd504e183df3ebe585c.zip | |
[vcpkg] pass -disableMetrics to bootstrap on git bash (#11299)
in git bash, we call back into bootstrap-vcpkg.bat,
but we don't pass -disableMetrics through.
This commit corrects this
Diffstat (limited to 'scripts/bootstrap.sh')
| -rw-r--r-- | scripts/bootstrap.sh | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 8567fd552..d45305fb5 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -6,14 +6,6 @@ while [ "$vcpkgRootDir" != "/" ] && ! [ -e "$vcpkgRootDir/.vcpkg-root" ]; do vcpkgRootDir="$(dirname "$vcpkgRootDir")" done -# Enable using this entry point on windows from git bash by redirecting to the .bat file. -unixName=$(uname -s | sed 's/MINGW.*_NT.*/MINGW_NT/') -if [ "$unixName" = "MINGW_NT" ]; then - vcpkgRootDir=$(cygpath -aw "$vcpkgRootDir") - cmd "/C $vcpkgRootDir\\bootstrap-vcpkg.bat" || exit 1 - exit 0 -fi - # Argument parsing vcpkgDisableMetrics="OFF" vcpkgUseSystem=false @@ -44,6 +36,20 @@ do fi done +# Enable using this entry point on windows from git bash by redirecting to the .bat file. +unixName=$(uname -s | sed 's/MINGW.*_NT.*/MINGW_NT/') +if [ "$unixName" = "MINGW_NT" ]; then + if [ "$vcpkgDisableMetrics" = "ON" ]; then + args="-disableMetrics" + else + args="" + fi + + vcpkgRootDir=$(cygpath -aw "$vcpkgRootDir") + cmd "/C $vcpkgRootDir\\bootstrap-vcpkg.bat $args" || exit 1 + exit 0 +fi + if [ -z ${VCPKG_DOWNLOADS+x} ]; then downloadsDir="$vcpkgRootDir/downloads" else |