Merge from hash.predef.

tools/ci/linux-cxx-install.sh

@@ -5,26 +5,41 @@
 # LLVM_VER: The LLVM toolset version to point the repo at.
 # PACKAGES: Compiler packages to install.
 
+if command -v sudo ; then
+    SUDO="sudo -E"
+fi
+OS_ISSUE=`cat /etc/issue | head -n1 | cut -d " " -f1`
+echo ">>>>> OS Issue: ${OS_ISSUE}"
+
+PACKAGES=${PACKAGES:-build-essential}
+
 set -e
 echo ">>>>>"
+echo ">>>>> APT: UPDATE.."
+echo ">>>>>"
+${SUDO} apt-get -o Acquire::Retries=3 update
+echo ">>>>>"
 echo ">>>>> APT: REPO.."
 echo ">>>>>"
-sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
-if test -n "${LLVM_OS}" -a -n "${LLVM_VER}" ; then
+${SUDO} apt-get -o Acquire::Retries=3 -y install software-properties-common
+if test "${OS_ISSUE}" = "Ubuntu" ; then
+    ${SUDO} apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
+fi
+if test -n "${LLVM_OS}" ; then
 	wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-	sudo -E apt-add-repository "deb http://apt.llvm.org/${LLVM_OS}/ llvm-toolchain-${LLVM_OS}-${LLVM_VER} main"
+	${SUDO} apt-add-repository "deb http://apt.llvm.org/${LLVM_OS}/ llvm-toolchain-${LLVM_OS}-${LLVM_VER} main"
 fi
 echo ">>>>>"
 echo ">>>>> APT: UPDATE.."
 echo ">>>>>"
-sudo -E apt-get -o Acquire::Retries=3 update
+${SUDO} apt-get -o Acquire::Retries=3 update
 echo ">>>>>"
 echo ">>>>> APT: INSTALL ${PACKAGES}.."
 echo ">>>>>"
-sudo -E apt-get -o Acquire::Retries=3 -yq --no-install-suggests --no-install-recommends install ${PACKAGES}
+${SUDO} apt-get -o Acquire::Retries=3 -yq --no-install-suggests --no-install-recommends install ${PACKAGES}
 
 # Use, modification, and distribution are
 # subject to the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE.txt)
 #
-# Copyright Rene Rivera 2020.
+# Copyright René Ferdinand Rivera Morell 2020-2022.