diff options
author | Joni Jantti <joni.jantti@qt.io> | 2018-01-24 10:48:07 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-26 13:12:41 +0000 |
commit | 6d1190aaa0d6c258f159e50d4aa3073b3e7f105f (patch) | |
tree | d31134769bd849598ab646f7d61bf34a5488e084 /coin/provisioning/common/macos | |
parent | 7681e742d701d6167484ece5fb6fcd33ba5202ff (diff) |
Provisioning: Use SetEnvVar helper function in scripts
Currently when adding an environment variable in provisioning we have
to check if the system is Ubuntu and use .profile instead of .bashrc.
This check should be done in a function so we don't have to duplicate
it for every provisioning script separately.
Change-Id: I2fa128032123e17d20dfb39cd3668e22e4bb0d55
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Diffstat (limited to 'coin/provisioning/common/macos')
-rwxr-xr-x | coin/provisioning/common/macos/cmake.sh | 5 | ||||
-rwxr-xr-x | coin/provisioning/common/macos/fbx_macos.sh | 5 | ||||
-rwxr-xr-x | coin/provisioning/common/macos/python3.sh | 6 |
3 files changed, 12 insertions, 4 deletions
diff --git a/coin/provisioning/common/macos/cmake.sh b/coin/provisioning/common/macos/cmake.sh index c727c8ff..f926de89 100755 --- a/coin/provisioning/common/macos/cmake.sh +++ b/coin/provisioning/common/macos/cmake.sh @@ -39,6 +39,8 @@ # shellcheck source=./InstallAppFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh" +# shellcheck source=../unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/cmake-3.6.2-Darwin-x86_64.tar.gz" AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Darwin-x86_64.tar.gz" @@ -47,5 +49,6 @@ appPrefix="cmake-3.6.2-Darwin-x86_64" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" -echo "export PATH=/Applications/CMake.app/Contents/bin:\$PATH" >> ~/.bashrc +SetEnvVar "PATH" "/Applications/CMake.app/Contents/bin:\$PATH" + echo "CMake = 3.6.2" >> ~/versions.txt diff --git a/coin/provisioning/common/macos/fbx_macos.sh b/coin/provisioning/common/macos/fbx_macos.sh index 9dc97814..b2ec8154 100755 --- a/coin/provisioning/common/macos/fbx_macos.sh +++ b/coin/provisioning/common/macos/fbx_macos.sh @@ -36,6 +36,8 @@ # shellcheck source=./../unix/try_catch.sh source "${BASH_SOURCE%/*}/../unix/try_catch.sh" +# shellcheck source=../unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" fileName="fbx20161_2_fbxsdk_clang_mac.pkg.tgz" targetFolder="/opt/fbx" @@ -74,6 +76,7 @@ echo "Running installer for '$installer'" sudo installer -pkg "$installer" -target "/" # Set env variables -echo "export FBXSDK=/Applications/Autodesk/FBX\ SDK/2016.1.2/" >> ~/.bashrc +SetEnvVar "FBXSDK" "/Applications/Autodesk/FBX\ SDK/2016.1.2/" + echo "FBX SDK = 2016.1.2" >> ~/versions.txt diff --git a/coin/provisioning/common/macos/python3.sh b/coin/provisioning/common/macos/python3.sh index fc20aa2d..f38ab5e6 100755 --- a/coin/provisioning/common/macos/python3.sh +++ b/coin/provisioning/common/macos/python3.sh @@ -37,6 +37,7 @@ # This script installs python3 source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh" +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-3.6.1-macosx10.6.pkg" AltUrl="https://www.python.org/ftp/python/3.6.1/python-3.6.1-macosx10.6.pkg" @@ -47,6 +48,7 @@ InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" /Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 install virtualenv -echo "export PYTHON3_PATH=/Library/Frameworks/Python.framework/Versions/3.6/bin" >> ~/.bashrc -echo "export PIP3_PATH=/Library/Frameworks/Python.framework/Versions/3.6/bin" >> ~/.bashrc +SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin" +SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin" + echo "python3 = 3.6.1" >> ~/versions.txt |