aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2018-05-16 04:48:26 +0000
committerAlexander Karatarakis <alkarata@microsoft.com>2018-05-16 04:51:08 +0000
commit52f01eefa6e1da7a9458807a1eb3d288ecd50613 (patch)
treee6f4a7cfd659a3ed5851544f14dab35a114133bb
parent6294c6af84441ec98dc18bdb00a1b5a6c4052e14 (diff)
downloadvcpkg-52f01eefa6e1da7a9458807a1eb3d288ecd50613.tar.gz
vcpkg-52f01eefa6e1da7a9458807a1eb3d288ecd50613.zip
[bootstrap.sh] Fix whitespace-in-path issues
-rwxr-xr-xbootstrap-vcpkg.sh2
-rw-r--r--scripts/bootstrap.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/bootstrap-vcpkg.sh b/bootstrap-vcpkg.sh
index b77b74890..a7643894c 100755
--- a/bootstrap-vcpkg.sh
+++ b/bootstrap-vcpkg.sh
@@ -1,4 +1,4 @@
#!/bin/sh
vcpkgRootDir=$(X= cd -- "$(dirname -- "$0")" && pwd -P)
-. $vcpkgRootDir/scripts/bootstrap.sh
+. "$vcpkgRootDir/scripts/bootstrap.sh"
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 8a4c92936..e999fa55e 100644
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -97,7 +97,7 @@ fetchTool()
return 1
fi
- xmlFileAsString=`cat $vcpkgRootDir/scripts/vcpkgTools.xml`
+ xmlFileAsString=`cat "$vcpkgRootDir/scripts/vcpkgTools.xml"`
toolRegexStart="<tool name=\"$tool\" os=\"$os\">"
toolData="$(extractStringBetweenDelimiters "$xmlFileAsString" "$toolRegexStart" "</tool>")"
if [ "$toolData" = "" ]; then