@@ -484,18 +484,24 @@ add support for dynamic modules in a way compatible with ngx_pagespeed until
484
484
extra_flags=()
485
485
# Now make sure our dependencies are installed.
486
486
if " $DO_DEPS_CHECK " ; then
487
+ INSTALL_FLAGS=" "
488
+
489
+ if " $ASSUME_YES " ; then
490
+ INSTALL_FLAGS=" -y"
491
+ fi
492
+
487
493
if [ -f /etc/debian_version ]; then
488
494
status " Detected debian-based distro."
489
495
490
- install_dependencies " apt-get install" debian_is_installed \
496
+ install_dependencies " apt-get install ${INSTALL_FLAGS} " debian_is_installed \
491
497
build-essential zlib1g-dev libpcre3 libpcre3-dev unzip uuid-dev
492
498
493
499
if gcc_too_old; then
494
500
if [ ! -e /usr/lib/gcc-mozilla/bin/gcc ]; then
495
501
status " Detected that gcc is older than 4.8. Installing gcc-mozilla"
496
502
status " which installs gcc-4.8 into /usr/lib/gcc-mozilla/ and doesn't"
497
503
status " affect your global gcc installation."
498
- run sudo apt-get install gcc-mozilla
504
+ run sudo apt-get install ${INSTALL_FLAGS} gcc-mozilla
499
505
fi
500
506
501
507
extra_flags=(" --with-cc=/usr/lib/gcc-mozilla/bin/gcc" \
@@ -505,7 +511,7 @@ add support for dynamic modules in a way compatible with ngx_pagespeed until
505
511
elif [ -f /etc/redhat-release ]; then
506
512
status " Detected redhat-based distro."
507
513
508
- install_dependencies " yum install" redhat_is_installed \
514
+ install_dependencies " yum install ${INSTALL_FLAGS} " redhat_is_installed \
509
515
gcc-c++ pcre-devel zlib-devel make unzip wget libuuid-devel
510
516
if gcc_too_old; then
511
517
if [ ! -e /opt/rh/devtoolset-2/root/usr/bin/gcc ]; then
@@ -539,7 +545,7 @@ $(cat /etc/redhat-release) Expected 5 or 6."
539
545
repo_url+=" /docs/repository/cern/devtoolset/"
540
546
repo_url+=" slc${slc_version} -devtoolset.repo"
541
547
run sudo wget -O " $repo_fname " " $repo_url "
542
- run sudo yum install devtoolset-2-gcc-c++ devtoolset-2-binutils
548
+ run sudo yum install ${INSTALL_FLAGS} devtoolset-2-gcc-c++ devtoolset-2-binutils
543
549
fi
544
550
extra_flags=(" --with-cc=/opt/rh/devtoolset-2/root/usr/bin/gcc" )
545
551
fi
0 commit comments