diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 17ecd1933..eb634bb93 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -429,6 +429,10 @@ function Build-PackageManagementEnvironmentTable { @{ "Name" = "VCPKG_INSTALLATION_ROOT" "Value" = $env:VCPKG_INSTALLATION_ROOT + }, + @{ + "Name" = "VCPKG_ROOT" + "Value" = $env:VCPKG_ROOT } ) | ForEach-Object { [PSCustomObject] @{ diff --git a/images/linux/scripts/installers/vcpkg.sh b/images/linux/scripts/installers/vcpkg.sh index 731de8b1b..39823e42f 100644 --- a/images/linux/scripts/installers/vcpkg.sh +++ b/images/linux/scripts/installers/vcpkg.sh @@ -4,16 +4,17 @@ ## Desc: Installs vcpkg ################################################################################ -# Set env variable for vcpkg -VCPKG_INSTALLATION_ROOT=/usr/local/share/vcpkg -echo "VCPKG_INSTALLATION_ROOT=${VCPKG_INSTALLATION_ROOT}" | tee -a /etc/environment +# Set env variables for vcpkg +VCPKG_ROOT=/usr/local/share/vcpkg +echo "VCPKG_INSTALLATION_ROOT=${VCPKG_ROOT}" | tee -a /etc/environment +echo "VCPKG_ROOT=${VCPKG_ROOT}" | tee -a /etc/environment # Install vcpkg -git clone https://github.com/Microsoft/vcpkg $VCPKG_INSTALLATION_ROOT +git clone https://github.com/Microsoft/vcpkg $VCPKG_ROOT -$VCPKG_INSTALLATION_ROOT/bootstrap-vcpkg.sh -$VCPKG_INSTALLATION_ROOT/vcpkg integrate install -chmod 0777 -R $VCPKG_INSTALLATION_ROOT -ln -sf $VCPKG_INSTALLATION_ROOT/vcpkg /usr/local/bin +$VCPKG_ROOT/bootstrap-vcpkg.sh +$VCPKG_ROOT/vcpkg integrate install +chmod 0777 -R $VCPKG_ROOT +ln -sf $VCPKG_ROOT/vcpkg /usr/local/bin invoke_tests "Tools" "Vcpkg" \ No newline at end of file