Add new '--no-confirm' option to avoid user interaction (needs to run ths script as sudo then)

This commit is contained in:
Bastien Montagne 2016-01-08 16:30:16 +01:00
parent 9ac83d499e
commit e108b8f102

@ -25,7 +25,7 @@
ARGS=$( \ ARGS=$( \
getopt \ getopt \
-o s:i:t:h \ -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:,\ 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-all,force-python,force-numpy,force-boost,force-ocio,force-openexr,force-oiio,force-llvm,force-osl,force-osd,\
force-ffmpeg,force-opencollada,\ force-ffmpeg,force-opencollada,\
@ -94,6 +94,9 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
--no-sudo --no-sudo
Disable use of sudo (this script won't be able to do much though, will just print needed packages...). 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 --with-all
By default, a number of optional and not-so-often needed libraries are not installed. 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 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" SUDO="sudo"
NO_CONFIRM=false
PYTHON_VERSION="3.5.1" PYTHON_VERSION="3.5.1"
PYTHON_VERSION_MIN="3.5" PYTHON_VERSION_MIN="3.5"
PYTHON_FORCE_BUILD=false PYTHON_FORCE_BUILD=false
@ -431,6 +436,9 @@ while true; do
PRINT "" PRINT ""
SUDO=""; shift; continue SUDO=""; shift; continue
;; ;;
--no-confirm)
NO_CONFIRM=true; shift; continue
;;
--with-all) --with-all)
WITH_ALL=true; shift; continue WITH_ALL=true; shift; continue
;; ;;
@ -2087,8 +2095,10 @@ install_DEB() {
PRINT "`eval _echo "$COMMON_INFO"`" PRINT "`eval _echo "$COMMON_INFO"`"
PRINT "" PRINT ""
read -p "Do you want to continue (Y/n)?" if [ "$NO_CONFIRM" = false ]; then
[ "$(echo ${REPLY:=Y} | tr [:upper:] [:lower:])" != "y" ] && exit 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/debian_version | grep ^6`" ]; then
if [ -z "`cat /etc/apt/sources.list | grep backports.debian.org`" ]; 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 "`eval _echo "$COMMON_INFO"`"
PRINT "" PRINT ""
read -p "Do you want to continue (Y/n)?" if [ "$NO_CONFIRM" = false ]; then
[ "$(echo ${REPLY:=Y} | tr [:upper:] [:lower:])" != "y" ] && exit 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 # Enable non-free repositories for all flavours
if [ ! $SUDO ]; then if [ ! $SUDO ]; then
@ -3093,8 +3105,10 @@ install_ARCH() {
PRINT "`eval _echo "$COMMON_INFO"`" PRINT "`eval _echo "$COMMON_INFO"`"
PRINT "" PRINT ""
read -p "Do you want to continue (Y/n)?" if [ "$NO_CONFIRM" = false ]; then
[ "$(echo ${REPLY:=Y} | tr [:upper:] [:lower:])" != "y" ] && exit read -p "Do you want to continue (Y/n)?"
[ "$(echo ${REPLY:=Y} | tr [:upper:] [:lower:])" != "y" ] && exit
fi
# Check for sudo... # Check for sudo...
if [ $SUDO ]; then if [ $SUDO ]; then
@ -3450,8 +3464,10 @@ install_OTHER() {
PRINT "`eval _echo "$DEPS_SPECIFIC_INFO"`" PRINT "`eval _echo "$DEPS_SPECIFIC_INFO"`"
PRINT "" PRINT ""
read -p "Do you want to continue (Y/n)?" if [ "$NO_CONFIRM" = false ]; then
[ "$(echo ${REPLY:=Y} | tr [:upper:] [:lower:])" != "y" ] && exit read -p "Do you want to continue (Y/n)?"
[ "$(echo ${REPLY:=Y} | tr [:upper:] [:lower:])" != "y" ] && exit
fi
PRINT "" PRINT ""
_do_compile_python=false _do_compile_python=false