Minor fix

This commit is contained in:
Vladimir Safonkin
2020-10-06 13:11:47 +03:00
parent 6b1e7f5cdb
commit 58cf3bb6a4
2 changed files with 2 additions and 3 deletions

View File

@@ -59,7 +59,6 @@ $packageManagementList = @(
(Get-YarnVersion),
(Get-PipVersion),
(Get-Pip3Version),
(Get-PipxVersion),
(Get-VcpkgVersion)
)

View File

@@ -11,7 +11,7 @@ toolset="$INSTALLER_SCRIPT_FOLDER/toolset.json"
pipx_packages=$(jq -r ".pipx[] .package" $toolset)
for package in $pipx_packages; do
python_version=$(jq -r ".pipx[] | select(.package == $package) .python" $toolset)
python_version=$(jq -r ".pipx[] | select(.package == \"$package\") .python" $toolset)
if [ "$python_version" != "null" ]; then
python_path="/opt/hostedtoolcache/Python/$python_version*/x64/bin/python$python_version"
echo "Install $package into python $python_path"
@@ -22,7 +22,7 @@ for package in $pipx_packages; do
fi
# Run tests to determine that the software installed as expected
cmd=$(jq -r ".pipx[] | select(.package == $package) .cmd" $toolset)
cmd=$(jq -r ".pipx[] | select(.package == \"$package\") .cmd" $toolset)
if ! command -v $cmd; then
echo "$package was not installed"
exit 1