Skip to content

Commit

Permalink
speed up subsequent compiles with devtoolset GCC
Browse files Browse the repository at this point in the history 
- skip yum install command for centos scl if already installed
  • Loading branch information
@centminmod
centminmod committed Dec 11, 2017
1 parent 6614a30 commit a2c201f
Show file tree
Hide file tree
Showing 20 changed files with 297 additions and 99 deletions.
48 changes: 36 additions & 12 deletions addons/wget.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,29 +202,41 @@ scl_install() {
if [[ "$(gcc --version | head -n1 | awk '{print $3}' | cut -d . -f1,2 | sed "s|\.|0|")" -lt '407' ]]; then
echo "install centos-release-scl for newer gcc and g++ versions"
if [[ -z "$(rpm -qa | grep rpmforge)" ]]; then
time $YUMDNFBIN -y -q install centos-release-scl
if [[ "$(rpm -ql centos-release-scl >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install centos-release-scl
fi
sar_call
else
time $YUMDNFBIN -y -q install centos-release-scl --disablerepo=rpmforge
if [[ "$(rpm -ql centos-release-scl >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install centos-release-scl --disablerepo=rpmforge
fi
sar_call
fi
if [[ "$DEVTOOLSETSIX" = [yY] ]]; then
if [[ -z "$(rpm -qa | grep rpmforge)" ]]; then
time $YUMDNFBIN -y -q install devtoolset-6-gcc devtoolset-6-gcc-c++ devtoolset-6-binutils
if [[ "$(rpm -ql devtoolset-6-gcc >/de6/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-6-gcc-c++ 6/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-6-binutils6>/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install devtoolset-6-gcc devtoolset-6-gcc-c++ devtoolset-6-binutils
fi
sar_call
else
time $YUMDNFBIN -y -q install devtoolset-6-gcc devtoolset-6-gcc-c++ devtoolset-6-binutils --disablerepo=rpmforge
if [[ "$(rpm -ql devtoolset-6-gcc >/de6/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-6-gcc-c++ 6/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-6-binutils6>/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install devtoolset-6-gcc devtoolset-6-gcc-c++ devtoolset-6-binutils --disablerepo=rpmforge
fi
sar_call
fi
echo
/opt/rh/devtoolset-6/root/usr/bin/gcc --version
/opt/rh/devtoolset-6/root/usr/bin/g++ --version
else
if [[ -z "$(rpm -qa | grep rpmforge)" ]]; then
time $YUMDNFBIN -y -q install devtoolset-4-gcc devtoolset-4-gcc-c++ devtoolset-4-binutils
if [[ "$(rpm -ql devtoolset-4-gcc >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-4-gcc-c++ >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-4-binutils >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install devtoolset-4-gcc devtoolset-4-gcc-c++ devtoolset-4-binutils
fi
sar_call
else
time $YUMDNFBIN -y -q install devtoolset-4-gcc devtoolset-4-gcc-c++ devtoolset-4-binutils --disablerepo=rpmforge
if [[ "$(rpm -ql devtoolset-4-gcc >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-4-gcc-c++ >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-4-binutils >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install devtoolset-4-gcc devtoolset-4-gcc-c++ devtoolset-4-binutils --disablerepo=rpmforge
fi
sar_call
fi
echo
Expand All @@ -234,29 +246,41 @@ scl_install() {
fi
elif [[ "$CENTOS_SEVEN" = '7' ]]; then
if [[ -z "$(rpm -qa | grep rpmforge)" ]]; then
time $YUMDNFBIN -y -q install centos-release-scl
if [[ "$(rpm -ql centos-release-scl >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install centos-release-scl
fi
sar_call
else
time $YUMDNFBIN -y -q install centos-release-scl --disablerepo=rpmforge
if [[ "$(rpm -ql centos-release-scl >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install centos-release-scl --disablerepo=rpmforge
fi
sar_call
fi
if [[ "$DEVTOOLSETSIX" = [yY] ]]; then
if [[ -z "$(rpm -qa | grep rpmforge)" ]]; then
time $YUMDNFBIN -y -q install devtoolset-6-gcc devtoolset-6-gcc-c++ devtoolset-6-binutils
if [[ "$(rpm -ql devtoolset-6-gcc >/de6/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-6-gcc-c++ 6/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-6-binutils6>/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install devtoolset-6-gcc devtoolset-6-gcc-c++ devtoolset-6-binutils
fi
sar_call
else
time $YUMDNFBIN -y -q install devtoolset-6-gcc devtoolset-6-gcc-c++ devtoolset-6-binutils --disablerepo=rpmforge
if [[ "$(rpm -ql devtoolset-6-gcc >/de6/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-6-gcc-c++ 6/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-6-binutils6>/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install devtoolset-6-gcc devtoolset-6-gcc-c++ devtoolset-6-binutils --disablerepo=rpmforge
fi
sar_call
fi
echo
/opt/rh/devtoolset-6/root/usr/bin/gcc --version
/opt/rh/devtoolset-6/root/usr/bin/g++ --version
else
if [[ -z "$(rpm -qa | grep rpmforge)" ]]; then
time $YUMDNFBIN -y -q install devtoolset-4-gcc devtoolset-4-gcc-c++ devtoolset-4-binutils
if [[ "$(rpm -ql devtoolset-4-gcc >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-4-gcc-c++ >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-4-binutils >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install devtoolset-4-gcc devtoolset-4-gcc-c++ devtoolset-4-binutils
fi
sar_call
else
time $YUMDNFBIN -y -q install devtoolset-4-gcc devtoolset-4-gcc-c++ devtoolset-4-binutils --disablerepo=rpmforge
if [[ "$(rpm -ql devtoolset-4-gcc >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-4-gcc-c++ >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-4-binutils >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install devtoolset-4-gcc devtoolset-4-gcc-c++ devtoolset-4-binutils --disablerepo=rpmforge
fi
sar_call
fi
echo
Expand Down
60 changes: 45 additions & 15 deletions inc/brotli.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,28 @@ scl_install() {
if [[ "$(gcc --version | head -n1 | awk '{print $3}' | cut -d . -f1,2 | sed "s|\.|0|")" -lt '407' ]]; then
echo "install centos-release-scl for newer gcc and g++ versions"
if [[ -z "$(rpm -qa | grep rpmforge)" ]]; then
time $YUMDNFBIN -y -q install centos-release-scl
if [[ "$(rpm -ql centos-release-scl >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install centos-release-scl
fi
sar_call
else
time $YUMDNFBIN -y -q install centos-release-scl --disablerepo=rpmforge
if [[ "$(rpm -ql centos-release-scl >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install centos-release-scl --disablerepo=rpmforge
fi
sar_call
fi
if [[ "$DEVTOOLSETSEVEN" = [yY] ]]; then
# llbm-toolset-7 for clang 4 isn't ready for centos 6.x yet
# if [[ "$DEVTOOLSETSEVEN" = [yY] || "$CLANG_FOUR" = [yY] ]]; then
if [[ -z "$(rpm -qa | grep rpmforge)" ]]; then
time $YUMDNFBIN -y -q install devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-binutils
if [[ "$(rpm -ql devtoolset-7-gcc >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-7-gcc-c++ >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-7-binutils >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-binutils
fi
sar_call
else
time $YUMDNFBIN -y -q install devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-binutils --disablerepo=rpmforge
if [[ "$(rpm -ql devtoolset-7-gcc >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-7-gcc-c++ >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-7-binutils >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-binutils --disablerepo=rpmforge
fi
sar_call
fi
# llbm-toolset-7 for clang 4 isn't ready for centos 6.x yet
Expand All @@ -53,21 +61,29 @@ scl_install() {
# fi
elif [[ "$DEVTOOLSETSIX" = [yY] ]]; then
if [[ -z "$(rpm -qa | grep rpmforge)" ]]; then
time $YUMDNFBIN -y -q install devtoolset-6-gcc devtoolset-6-gcc-c++ devtoolset-6-binutils
if [[ "$(rpm -ql devtoolset-6-gcc >/de6/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-6-gcc-c++ 6/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-6-binutils6>/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install devtoolset-6-gcc devtoolset-6-gcc-c++ devtoolset-6-binutils
fi
sar_call
else
time $YUMDNFBIN -y -q install devtoolset-6-gcc devtoolset-6-gcc-c++ devtoolset-6-binutils --disablerepo=rpmforge
if [[ "$(rpm -ql devtoolset-6-gcc >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-6-gcc-c++ >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-6-binutils >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install devtoolset-6-gcc devtoolset-6-gcc-c++ devtoolset-6-binutils --disablerepo=rpmforge
fi
sar_call
fi
echo
/opt/rh/devtoolset-6/root/usr/bin/gcc --version
/opt/rh/devtoolset-6/root/usr/bin/g++ --version
else
if [[ -z "$(rpm -qa | grep rpmforge)" ]]; then
time $YUMDNFBIN -y -q install devtoolset-4-gcc devtoolset-4-gcc-c++ devtoolset-4-binutils
if [[ "$(rpm -ql devtoolset-4-gcc >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-4-gcc-c++ >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-4-binutils >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install devtoolset-4-gcc devtoolset-4-gcc-c++ devtoolset-4-binutils
fi
sar_call
else
time $YUMDNFBIN -y -q install devtoolset-4-gcc devtoolset-4-gcc-c++ devtoolset-4-binutils --disablerepo=rpmforge
if [[ "$(rpm -ql devtoolset-4-gcc >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-4-gcc-c++ >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-4-binutils >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install devtoolset-4-gcc devtoolset-4-gcc-c++ devtoolset-4-binutils --disablerepo=rpmforge
fi
sar_call
fi
echo
Expand All @@ -80,15 +96,21 @@ scl_install() {
time $YUMDNFBIN -y -q install centos-release-scl
sar_call
else
time $YUMDNFBIN -y -q install centos-release-scl --disablerepo=rpmforge
if [[ "$(rpm -ql centos-release-scl >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install centos-release-scl --disablerepo=rpmforge
fi
sar_call
fi
if [[ "$DEVTOOLSETSEVEN" = [yY] || "$CLANG_FOUR" = [yY] ]]; then
if [[ -z "$(rpm -qa | grep rpmforge)" ]]; then
time $YUMDNFBIN -y -q install devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-binutils
if [[ "$(rpm -ql devtoolset-7-gcc >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-7-gcc-c++ >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-7-binutils >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-binutils
fi
sar_call
else
time $YUMDNFBIN -y -q install devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-binutils --disablerepo=rpmforge
if [[ "$(rpm -ql devtoolset-7-gcc >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-7-gcc-c++ >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-7-binutils >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-binutils --disablerepo=rpmforge
fi
sar_call
fi
if [[ "$CLANG_FOUR" = [yY] && ! -f /opt/rh/llvm-toolset-7/root/usr/bin/clang ]]; then
Expand All @@ -105,21 +127,29 @@ scl_install() {
# fi
elif [[ "$DEVTOOLSETSIX" = [yY] ]]; then
if [[ -z "$(rpm -qa | grep rpmforge)" ]]; then
time $YUMDNFBIN -y -q install devtoolset-6-gcc devtoolset-6-gcc-c++ devtoolset-6-binutils
if [[ "$(rpm -ql devtoolset-6-gcc >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-6-gcc-c++ >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-6-binutils >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install devtoolset-6-gcc devtoolset-6-gcc-c++ devtoolset-6-binutils
fi
sar_call
else
time $YUMDNFBIN -y -q install devtoolset-6-gcc devtoolset-6-gcc-c++ devtoolset-6-binutils --disablerepo=rpmforge
if [[ "$(rpm -ql devtoolset-6-gcc >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-6-gcc-c++ >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-6-binutils >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install devtoolset-6-gcc devtoolset-6-gcc-c++ devtoolset-6-binutils --disablerepo=rpmforge
fi
sar_call
fi
echo
/opt/rh/devtoolset-6/root/usr/bin/gcc --version
/opt/rh/devtoolset-6/root/usr/bin/g++ --version
else
if [[ -z "$(rpm -qa | grep rpmforge)" ]]; then
time $YUMDNFBIN -y -q install devtoolset-4-gcc devtoolset-4-gcc-c++ devtoolset-4-binutils
if [[ "$(rpm -ql devtoolset-4-gcc >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-4-gcc-c++ >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-4-binutils >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install devtoolset-4-gcc devtoolset-4-gcc-c++ devtoolset-4-binutils
fi
sar_call
else
time $YUMDNFBIN -y -q install devtoolset-4-gcc devtoolset-4-gcc-c++ devtoolset-4-binutils --disablerepo=rpmforge
if [[ "$(rpm -ql devtoolset-4-gcc >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-4-gcc-c++ >/dev/null 2>&1; echo $?)" -ne '0' ]] || [[ "$(rpm -ql devtoolset-4-binutils >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install devtoolset-4-gcc devtoolset-4-gcc-c++ devtoolset-4-binutils --disablerepo=rpmforge
fi
sar_call
fi
echo
Expand Down
16 changes: 12 additions & 4 deletions installer-dnf-gitlab.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -401,10 +401,14 @@ scl_install() {
if [[ "$(gcc --version | head -n1 | awk '{print $3}' | cut -d . -f1,2 | sed "s|\.|0|")" -lt '407' ]]; then
echo "install centos-release-scl for newer gcc and g++ versions"
if [[ -z "$(rpm -qa | grep rpmforge)" ]]; then
time $YUMDNFBIN -y -q install centos-release-scl
if [[ "$(rpm -ql centos-release-scl >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install centos-release-scl
fi
sar_call
else
time $YUMDNFBIN -y -q install centos-release-scl --disablerepo=rpmforge
if [[ "$(rpm -ql centos-release-scl >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install centos-release-scl --disablerepo=rpmforge
fi
sar_call
fi
if [[ "$DEVTOOLSETSIX" = [yY] ]]; then
Expand Down Expand Up @@ -433,10 +437,14 @@ scl_install() {
fi
elif [[ "$CENTOS_SEVEN" = '7' ]]; then
if [[ -z "$(rpm -qa | grep rpmforge)" ]]; then
time $YUMDNFBIN -y -q install centos-release-scl
if [[ "$(rpm -ql centos-release-scl >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install centos-release-scl
fi
sar_call
else
time $YUMDNFBIN -y -q install centos-release-scl --disablerepo=rpmforge
if [[ "$(rpm -ql centos-release-scl >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install centos-release-scl --disablerepo=rpmforge
fi
sar_call
fi
if [[ "$DEVTOOLSETSIX" = [yY] ]]; then
Expand Down
16 changes: 12 additions & 4 deletions installer-dnf.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -401,10 +401,14 @@ scl_install() {
if [[ "$(gcc --version | head -n1 | awk '{print $3}' | cut -d . -f1,2 | sed "s|\.|0|")" -lt '407' ]]; then
echo "install centos-release-scl for newer gcc and g++ versions"
if [[ -z "$(rpm -qa | grep rpmforge)" ]]; then
time $YUMDNFBIN -y -q install centos-release-scl
if [[ "$(rpm -ql centos-release-scl >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install centos-release-scl
fi
sar_call
else
time $YUMDNFBIN -y -q install centos-release-scl --disablerepo=rpmforge
if [[ "$(rpm -ql centos-release-scl >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install centos-release-scl --disablerepo=rpmforge
fi
sar_call
fi
if [[ "$DEVTOOLSETSIX" = [yY] ]]; then
Expand Down Expand Up @@ -433,10 +437,14 @@ scl_install() {
fi
elif [[ "$CENTOS_SEVEN" = '7' ]]; then
if [[ -z "$(rpm -qa | grep rpmforge)" ]]; then
time $YUMDNFBIN -y -q install centos-release-scl
if [[ "$(rpm -ql centos-release-scl >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install centos-release-scl
fi
sar_call
else
time $YUMDNFBIN -y -q install centos-release-scl --disablerepo=rpmforge
if [[ "$(rpm -ql centos-release-scl >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install centos-release-scl --disablerepo=rpmforge
fi
sar_call
fi
if [[ "$DEVTOOLSETSIX" = [yY] ]]; then
Expand Down
16 changes: 12 additions & 4 deletions installer-gitlab.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -401,10 +401,14 @@ scl_install() {
if [[ "$(gcc --version | head -n1 | awk '{print $3}' | cut -d . -f1,2 | sed "s|\.|0|")" -lt '407' ]]; then
echo "install centos-release-scl for newer gcc and g++ versions"
if [[ -z "$(rpm -qa | grep rpmforge)" ]]; then
time $YUMDNFBIN -y -q install centos-release-scl
if [[ "$(rpm -ql centos-release-scl >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install centos-release-scl
fi
sar_call
else
time $YUMDNFBIN -y -q install centos-release-scl --disablerepo=rpmforge
if [[ "$(rpm -ql centos-release-scl >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install centos-release-scl --disablerepo=rpmforge
fi
sar_call
fi
if [[ "$DEVTOOLSETSIX" = [yY] ]]; then
Expand Down Expand Up @@ -433,10 +437,14 @@ scl_install() {
fi
elif [[ "$CENTOS_SEVEN" = '7' ]]; then
if [[ -z "$(rpm -qa | grep rpmforge)" ]]; then
time $YUMDNFBIN -y -q install centos-release-scl
if [[ "$(rpm -ql centos-release-scl >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install centos-release-scl
fi
sar_call
else
time $YUMDNFBIN -y -q install centos-release-scl --disablerepo=rpmforge
if [[ "$(rpm -ql centos-release-scl >/dev/null 2>&1; echo $?)" -ne '0' ]]; then
time $YUMDNFBIN -y -q install centos-release-scl --disablerepo=rpmforge
fi
sar_call
fi
if [[ "$DEVTOOLSETSIX" = [yY] ]]; then
Expand Down
Loading

0 comments on commit a2c201f

Please sign in to comment.