From 85eb37bf83bda03584c3868b3c233acb3333192a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 29 Oct 2024 12:25:28 +0200 Subject: [PATCH] Provisioning: Fix once more the SBOM_PYTHON_APPS_PATH in macOS Change-Id: I733a6b2ea25e4d76c19ef921b7706cd0464c3120 Reviewed-by: Alexandru Croitor (cherry picked from commit e7ef5d8f1b9df3e19e82323aa399e74d0005d9cc) Reviewed-by: Jukka Jokiniva --- coin/provisioning/qtci-macos-12-arm/25-python.sh | 4 ++-- coin/provisioning/qtci-macos-13-arm/25-python.sh | 4 ++-- coin/provisioning/qtci-macos-14-arm/25-python.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/coin/provisioning/qtci-macos-12-arm/25-python.sh b/coin/provisioning/qtci-macos-12-arm/25-python.sh index ef90d763..bc0857a5 100755 --- a/coin/provisioning/qtci-macos-12-arm/25-python.sh +++ b/coin/provisioning/qtci-macos-12-arm/25-python.sh @@ -19,9 +19,9 @@ SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH" # Provisioning during installation says: -# 'The script sbom2doc is installed in '/home/qt/.local/bin' which is not on PATH.' +# 'The script sbom2doc is installed in '$HOME/.local/bin' which is not on PATH.' # hence the explicit assignment to SBOM_PYTHON_APPS_PATH. -SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin" +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Users/qt/.local/bin" # QtWebengine still requires python2 pyenv install 2.7.18 diff --git a/coin/provisioning/qtci-macos-13-arm/25-python.sh b/coin/provisioning/qtci-macos-13-arm/25-python.sh index ef90d763..bc0857a5 100755 --- a/coin/provisioning/qtci-macos-13-arm/25-python.sh +++ b/coin/provisioning/qtci-macos-13-arm/25-python.sh @@ -19,9 +19,9 @@ SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH" # Provisioning during installation says: -# 'The script sbom2doc is installed in '/home/qt/.local/bin' which is not on PATH.' +# 'The script sbom2doc is installed in '$HOME/.local/bin' which is not on PATH.' # hence the explicit assignment to SBOM_PYTHON_APPS_PATH. -SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin" +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Users/qt/.local/bin" # QtWebengine still requires python2 pyenv install 2.7.18 diff --git a/coin/provisioning/qtci-macos-14-arm/25-python.sh b/coin/provisioning/qtci-macos-14-arm/25-python.sh index 2a03b217..37c61881 100755 --- a/coin/provisioning/qtci-macos-14-arm/25-python.sh +++ b/coin/provisioning/qtci-macos-14-arm/25-python.sh @@ -19,8 +19,8 @@ SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH" # Provisioning during installation says: -# 'The script sbom2doc is installed in '/home/qt/.local/bin' which is not on PATH.' +# 'The script sbom2doc is installed in '$HOME/.local/bin' which is not on PATH.' # hence the explicit assignment to SBOM_PYTHON_APPS_PATH. -SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin" +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Users/qt/.local/bin" echo "python3 = 3.9.7" >> ~/versions.txt