1 files changed, 36 insertions, 38 deletions

diff --git a/coin/provisioning/common/unix/common.sourced.sh b/coin/provisioning/common/unix/common.sourced.sh
index a52880b2..c15d9453 100644..100755
--- a/coin/provisioning/common/unix/common.sourced.sh
+++ b/coin/provisioning/common/unix/common.sourced.sh
@@ -1,38 +1,6 @@
 #!/bin/sh
-
-
-#############################################################################
-##
-## Copyright (C) 2019 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
+# Copyright (C) 2019 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 
 # Script to be sourced from everywhere you need a common environment. Defines:
@@ -43,6 +11,7 @@ export PROVISIONING_ARCH
 export CMD_PKG_INSTALL
 export CMD_PKG_LOCALINSTALL
 export CMD_INSTALL
+export COIN_RUNS_IN_QT_COMPANY
 
 
 
@@ -65,8 +34,10 @@ fatal () {
     fi
 }
 
+# Takes one argument which should be the filename of this script. Returns true
+# if the script is being sourced, false if the script is being executed.
 is_script_executed () {
-   [ x"$(basename "$0")" = x"$1" ]
+    [ "$(basename "$(echo "$0" | sed s/^-//)")" = "$1" ]
 }
 
 
@@ -74,20 +45,39 @@ is_script_executed  common.sourced.sh  \
     && fatal "Script common.sourced.sh should always be sourced, not executed"
 
 
+_detect_linux_OS_ID () {
+    if [ -f /etc/os-release ]
+    then
+        # shellcheck source=/dev/null
+        . /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 () {
     # Unfortunately we can't find the provisioning directory from a sourced
     # script in a portable way
     # PROVISIONING_DIR="$(dirname "$0")/../../"
 
-    [ x"$PROVISIONING_DIR" = x ]  \
+    [ -z "$PROVISIONING_DIR" ]  \
         &&  fatal  "PROVISIONING_DIR variable needs to be set before calling set_common_environment"
 
     uname_s="$(uname -s)"
     case "$uname_s" in
         Linux)
             PROVISIONING_OS=linux
-            . /etc/os-release
-            PROVISIONING_OS_ID="$ID"
+            _detect_linux_OS_ID
             case "$PROVISIONING_OS_ID" in
                 suse|sles|opensuse*)
                     CMD_PKG_INSTALL="sudo zypper -nq install"
@@ -118,11 +108,19 @@ set_common_environment () {
     uname_m="$(uname -m)"
     case "$uname_m" in
         x86_64|amd64) PROVISIONING_ARCH=amd64 ;;
+        aarch64|arm64)PROVISIONING_ARCH=arm64 ;;
         i[3456]86)    PROVISIONING_ARCH=x86  ;;
         *) fatal "Unknown architecture in uname: $uname_m" 43 ;;
     esac
 
     CMD_INSTALL="sudo install"
+
+    COIN_RUNS_IN_QT_COMPANY=false
+    if  ping -c1 repo-clones.ci.qt.io  >/dev/null 2>&1
+    then
+        COIN_RUNS_IN_QT_COMPANY=true
+    fi
+
 }
 
 set_common_environment