From e108b8f102cd514f56bb328f3142aed8e9a67657 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Fri, 8 Jan 2016 16:30:16 +0100 Subject: Add new '--no-confirm' option to avoid user interaction (needs to run ths script as sudo then) --- build_files/build_environment/install_deps.sh | 34 ++++++++++++++++++++------- 1 file changed, 25 insertions(+), 9 deletions(-) (limited to 'build_files/build_environment/install_deps.sh') diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 1298753b6d8..54ff09cf7c3 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -25,7 +25,7 @@ ARGS=$( \ getopt \ -o s:i:t:h \ ---long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,with-all,with-opencollada,\ +--long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,no-confirm,with-all,with-opencollada,\ ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,ver-osd:,\ force-all,force-python,force-numpy,force-boost,force-ocio,force-openexr,force-oiio,force-llvm,force-osl,force-osd,\ force-ffmpeg,force-opencollada,\ @@ -94,6 +94,9 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS: --no-sudo Disable use of sudo (this script won't be able to do much though, will just print needed packages...). + --no-confirm + Disable any interaction with user (suitable for automated run). + --with-all By default, a number of optional and not-so-often needed libraries are not installed. This option will try to install them, at the cost of potential conflicts (depending on @@ -249,6 +252,8 @@ DO_SHOW_DEPS=false SUDO="sudo" +NO_CONFIRM=false + PYTHON_VERSION="3.5.1" PYTHON_VERSION_MIN="3.5" PYTHON_FORCE_BUILD=false @@ -431,6 +436,9 @@ while true; do PRINT "" SUDO=""; shift; continue ;; + --no-confirm) + NO_CONFIRM=true; shift; continue + ;; --with-all) WITH_ALL=true; shift; continue ;; @@ -2087,8 +2095,10 @@ install_DEB() { PRINT "`eval _echo "$COMMON_INFO"`" PRINT "" - read -p "Do you want to continue (Y/n)?" - [ "$(echo ${REPLY:=Y} | tr [:upper:] [:lower:])" != "y" ] && exit + if [ "$NO_CONFIRM" = false ]; then + read -p "Do you want to continue (Y/n)?" + [ "$(echo ${REPLY:=Y} | tr [:upper:] [:lower:])" != "y" ] && exit + fi if [ ! -z "`cat /etc/debian_version | grep ^6`" ]; then if [ -z "`cat /etc/apt/sources.list | grep backports.debian.org`" ]; then @@ -2618,8 +2628,10 @@ install_RPM() { PRINT "`eval _echo "$COMMON_INFO"`" PRINT "" - read -p "Do you want to continue (Y/n)?" - [ "$(echo ${REPLY:=Y} | tr [:upper:] [:lower:])" != "y" ] && exit + if [ "$NO_CONFIRM" = false ]; then + read -p "Do you want to continue (Y/n)?" + [ "$(echo ${REPLY:=Y} | tr [:upper:] [:lower:])" != "y" ] && exit + fi # Enable non-free repositories for all flavours if [ ! $SUDO ]; then @@ -3093,8 +3105,10 @@ install_ARCH() { PRINT "`eval _echo "$COMMON_INFO"`" PRINT "" - read -p "Do you want to continue (Y/n)?" - [ "$(echo ${REPLY:=Y} | tr [:upper:] [:lower:])" != "y" ] && exit + if [ "$NO_CONFIRM" = false ]; then + read -p "Do you want to continue (Y/n)?" + [ "$(echo ${REPLY:=Y} | tr [:upper:] [:lower:])" != "y" ] && exit + fi # Check for sudo... if [ $SUDO ]; then @@ -3450,8 +3464,10 @@ install_OTHER() { PRINT "`eval _echo "$DEPS_SPECIFIC_INFO"`" PRINT "" - read -p "Do you want to continue (Y/n)?" - [ "$(echo ${REPLY:=Y} | tr [:upper:] [:lower:])" != "y" ] && exit + if [ "$NO_CONFIRM" = false ]; then + read -p "Do you want to continue (Y/n)?" + [ "$(echo ${REPLY:=Y} | tr [:upper:] [:lower:])" != "y" ] && exit + fi PRINT "" _do_compile_python=false -- cgit v1.2.3