Added the argument --quiet and -q so then when used with a regular

user there is no output to the screen.
This commit is contained in:
Geoffroy Doucet
2016-06-13 21:29:51 -04:00
parent aec91b84a0
commit 8c8125c6fd
2 changed files with 20 additions and 6 deletions
+8 -1
View File
@@ -34,6 +34,7 @@ Help for certbot itself cannot be provided until it is installed.
-n, --non-interactive, --noninteractive run without asking for user input -n, --non-interactive, --noninteractive run without asking for user input
--no-self-upgrade do not download updates --no-self-upgrade do not download updates
--os-packages-only install OS dependencies and exit --os-packages-only install OS dependencies and exit
-q, --quiet provide only update/error output
-v, --verbose provide more output -v, --verbose provide more output
All arguments are accepted and forwarded to the Certbot client when run." All arguments are accepted and forwarded to the Certbot client when run."
@@ -52,15 +53,19 @@ for arg in "$@" ; do
HELP=1;; HELP=1;;
--noninteractive|--non-interactive) --noninteractive|--non-interactive)
ASSUME_YES=1;; ASSUME_YES=1;;
--quiet)
QUIET=1;;
--verbose) --verbose)
VERBOSE=1;; VERBOSE=1;;
-[!-]*) -[!-]*)
while getopts ":hnv" short_arg $arg; do while getopts ":hnvq" short_arg $arg; do
case "$short_arg" in case "$short_arg" in
h) h)
HELP=1;; HELP=1;;
n) n)
ASSUME_YES=1;; ASSUME_YES=1;;
q)
QUIET=1;;
v) v)
VERBOSE=1;; VERBOSE=1;;
esac esac
@@ -898,9 +903,11 @@ UNLIKELY_EOF
fi fi
if [ -n "$SUDO" ]; then if [ -n "$SUDO" ]; then
# SUDO is su wrapper or sudo # SUDO is su wrapper or sudo
if [ "$QUIET" != 1 ]; then
echo "Requesting root privileges to run certbot..." echo "Requesting root privileges to run certbot..."
echo " $VENV_BIN/letsencrypt" "$@" echo " $VENV_BIN/letsencrypt" "$@"
fi fi
fi
if [ -z "$SUDO_ENV" ] ; then if [ -z "$SUDO_ENV" ] ; then
# SUDO is su wrapper / noop # SUDO is su wrapper / noop
$SUDO "$VENV_BIN/letsencrypt" "$@" $SUDO "$VENV_BIN/letsencrypt" "$@"
@@ -34,6 +34,7 @@ Help for certbot itself cannot be provided until it is installed.
-n, --non-interactive, --noninteractive run without asking for user input -n, --non-interactive, --noninteractive run without asking for user input
--no-self-upgrade do not download updates --no-self-upgrade do not download updates
--os-packages-only install OS dependencies and exit --os-packages-only install OS dependencies and exit
-q, --quiet provide only update/error output
-v, --verbose provide more output -v, --verbose provide more output
All arguments are accepted and forwarded to the Certbot client when run." All arguments are accepted and forwarded to the Certbot client when run."
@@ -52,15 +53,19 @@ for arg in "$@" ; do
HELP=1;; HELP=1;;
--noninteractive|--non-interactive) --noninteractive|--non-interactive)
ASSUME_YES=1;; ASSUME_YES=1;;
--quiet)
QUIET=1;;
--verbose) --verbose)
VERBOSE=1;; VERBOSE=1;;
-[!-]*) -[!-]*)
while getopts ":hnv" short_arg $arg; do while getopts ":hnvq" short_arg $arg; do
case "$short_arg" in case "$short_arg" in
h) h)
HELP=1;; HELP=1;;
n) n)
ASSUME_YES=1;; ASSUME_YES=1;;
q)
QUIET=1;;
v) v)
VERBOSE=1;; VERBOSE=1;;
esac esac
@@ -257,9 +262,11 @@ UNLIKELY_EOF
fi fi
if [ -n "$SUDO" ]; then if [ -n "$SUDO" ]; then
# SUDO is su wrapper or sudo # SUDO is su wrapper or sudo
if [ "$QUIET" != 1 ]; then
echo "Requesting root privileges to run certbot..." echo "Requesting root privileges to run certbot..."
echo " $VENV_BIN/letsencrypt" "$@" echo " $VENV_BIN/letsencrypt" "$@"
fi fi
fi
if [ -z "$SUDO_ENV" ] ; then if [ -z "$SUDO_ENV" ] ; then
# SUDO is su wrapper / noop # SUDO is su wrapper / noop
$SUDO "$VENV_BIN/letsencrypt" "$@" $SUDO "$VENV_BIN/letsencrypt" "$@"