Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

install: Clean up organization of option parsing. 

The parsing of options from environment variables belongs right next
to the normal kind; and `show_help` was unnecessary indirection.
This commit is contained in:
Greg Price 2018-02-08 17:12:36 -08:00
parent 08135e3666
commit 218b653930
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
scripts/lib/install
View File

@ -20,7 +20,7 @@ args="$(getopt -o '' --long help,self-signed-cert,certbot,hostname:,email:,expre
eval "set -- $args" eval "set -- $args"
while true; do while true; do
case "$1" in case "$1" in
--help) show_help=1; shift;; --help) usage;;
--self-signed-cert) SELF_SIGNED_CERT=1; shift;; --self-signed-cert) SELF_SIGNED_CERT=1; shift;;
--certbot) USE_CERTBOT=1; shift;; --certbot) USE_CERTBOT=1; shift;;
--hostname) EXTERNAL_HOST="$2"; shift; shift;; --hostname) EXTERNAL_HOST="$2"; shift; shift;;
@ -35,9 +35,19 @@ if [ "$#" -gt 0 ]; then
usage usage
fi fi
if [ -n "$show_help" ]; then ## Options from environment variables.
usage #
fi # Specify options for apt.
APT_OPTIONS="${APT_OPTIONS:-}"
# Install additional packages using apt.
ADDITIONAL_PACKAGES=${ADDITIONAL_PACKAGES:-}
# Deployment type is almost always voyager.
DEPLOYMENT_TYPE="${DEPLOYMENT_TYPE:-voyager}"
# Comma-separated list of puppet manifests to install. default is
# zulip::voyager for an all-in-one system or zulip::dockervoyager for
# Docker. Use e.g. zulip::app_frontend for a Zulip frontend server.
PUPPET_CLASSES="${PUPPET_CLASSES:-zulip::voyager}"
VIRTUALENV_NEEDED="${VIRTUALENV_NEEDED:-yes}"
if [ -n "$SELF_SIGNED_CERT" ] && [ -n "$USE_CERTBOT" ]; then if [ -n "$SELF_SIGNED_CERT" ] && [ -n "$USE_CERTBOT" ]; then
echo "error: --self-signed-cert and --certbot are incompatible" >&2 echo "error: --self-signed-cert and --certbot are incompatible" >&2
@ -61,18 +71,6 @@ set -x
# Force a known locale. Some packages on PyPI fail to install in some locales. # Force a known locale. Some packages on PyPI fail to install in some locales.
export LC_ALL="en_US.UTF-8" export LC_ALL="en_US.UTF-8"
# Specify options for apt.
APT_OPTIONS="${APT_OPTIONS:-}"
# Install additional packages using apt.
ADDITIONAL_PACKAGES=${ADDITIONAL_PACKAGES:-}
# Deployment type is almost always voyager.
DEPLOYMENT_TYPE="${DEPLOYMENT_TYPE:-voyager}"
# Comma-separated list of puppet manifests to install. default is
# zulip::voyager for an all-in-one system or zulip::dockervoyager for
# Docker. Use e.g. zulip::app_frontend for a Zulip frontend server.
PUPPET_CLASSES="${PUPPET_CLASSES:-zulip::voyager}"
VIRTUALENV_NEEDED="${VIRTUALENV_NEEDED:-yes}"
# Check for at least ~1.9GB of RAM before starting installation; # Check for at least ~1.9GB of RAM before starting installation;
# otherwise users will find out about insufficient RAM via weird # otherwise users will find out about insufficient RAM via weird
# errors like a segfault running `pip install`. # errors like a segfault running `pip install`.