diff options
author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-29 13:43:08 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-29 13:44:48 +0100 |
commit | 351a519340d509300c754d0a62771a7f6e38ea4c (patch) | |
tree | d7181ebd455c7081f682bd0c82a988f25e0aa446 /coin/provisioning/common/linux/cmake_linux.sh | |
parent | 3c3d56c0cc3107a0b1d110bc1b61ee2f3cd05a90 (diff) | |
parent | 485244b016172445aa20bd31fb84fec6b7724cf5 (diff) |
Merge remote-tracking branch 'origin/5.10.1' into 5.10
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Change-Id: I218ce5567da7ea383009dca2c04beb974511dfcc
Diffstat (limited to 'coin/provisioning/common/linux/cmake_linux.sh')
-rwxr-xr-x | coin/provisioning/common/linux/cmake_linux.sh | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index 27358a20..98af57c8 100755 --- a/coin/provisioning/common/linux/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -39,6 +39,7 @@ # shellcheck source=InstallFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" version="3.6.2" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" @@ -49,9 +50,4 @@ appPrefix="cmake-$version-Linux-x86_64" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" -echo "Adding $targetFolder/bin to PATH" -if uname -a |grep -q "Ubuntu"; then - echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.profile -else - echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc -fi +SetEnvVar "PATH" "$targetFolder/bin:\$PATH" |