lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-21 20:36:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix provisioning script for RHEL 6

Browse Source 
It seems RHEL 6.6 does not provide /etc/os-release.

Change-Id: I01ba2bb17b89c01f9991944a11eeaa9c2eba6f20
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
This commit is contained in:
Dimitrios Apostolou
2019-10-02 19:04:25 +02:00
parent 37b2f54919
commit d97d1af1ee
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
coin/provisioning/common/unix/common.sourced.sh
View File

@@ -74,6 +74,25 @@ is_script_executed common.sourced.sh \
&& fatal "Script common.sourced.sh should always be sourced, not executed" && fatal "Script common.sourced.sh should always be sourced, not executed"
_detect_linux_OS_ID () {
if [ -f /etc/os-release ]
then
. /etc/os-release
PROVISIONING_OS_ID="$ID"
elif [ -f /etc/redhat-release ]
then
case "$(cat /etc/redhat-release)" in
"Red Hat Enterprise Linux"*)
PROVISIONING_OS_ID="rhel"
;;
"CentOS Linux"*)
PROVISIONING_OS_ID="centos"
;;
*) fatal "Unknown string in /etc/redhat-release" ;;
esac
fi
}
set_common_environment () { set_common_environment () {
# Unfortunately we can't find the provisioning directory from a sourced # Unfortunately we can't find the provisioning directory from a sourced
# script in a portable way # script in a portable way
@@ -86,8 +105,7 @@ set_common_environment () {
case "$uname_s" in case "$uname_s" in
Linux) Linux)
PROVISIONING_OS=linux PROVISIONING_OS=linux
. /etc/os-release _detect_linux_OS_ID
PROVISIONING_OS_ID="$ID"
case "$PROVISIONING_OS_ID" in case "$PROVISIONING_OS_ID" in
suse|sles|opensuse*) suse|sles|opensuse*)
CMD_PKG_INSTALL="sudo zypper -nq install" CMD_PKG_INSTALL="sudo zypper -nq install"