diff options
| author | Alexandre Flament <alex@al-f.net> | 2020-12-27 08:27:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-27 08:27:52 +0100 |
| commit | 48b4af1e08d54ec399f8ab77dd34b0f6380b3111 (patch) | |
| tree | 2a6e4cd8896c75109db7d6b41e29169979684f69 /utils/lib.sh | |
| parent | 2fc2d17a27150586f47d25876907bc9c33a829a5 (diff) | |
| parent | d175a0fb7bdcc00632a9092f5de1037f0dd1d811 (diff) | |
Merge pull request #2421 from return42/mod-pyenvinstall
[perf] optimize creation of the virtualenv & pyenvinstal targets
Diffstat (limited to 'utils/lib.sh')
| -rwxr-xr-x | utils/lib.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/utils/lib.sh b/utils/lib.sh index 0d93138cc..83dd75077 100755 --- a/utils/lib.sh +++ b/utils/lib.sh @@ -41,7 +41,7 @@ DOT_CONFIG="${DOT_CONFIG:-${REPO_ROOT}/.config.sh}" source_dot_config() { if [[ ! -e "${DOT_CONFIG}" ]]; then - err_msg "configuration does not extsts at: ${DOT_CONFIG}" + err_msg "configuration does not exists at: ${DOT_CONFIG}" return 42 fi # shellcheck disable=SC1090 @@ -159,7 +159,7 @@ clean_stdin() { } wait_key(){ - # usage: waitKEY [<timeout in sec>] + # usage: wait_key [<timeout in sec>] clean_stdin local _t=$1 @@ -639,7 +639,7 @@ nginx_distro_setup() { NGINX_DEFAULT_SERVER=/etc/nginx/nginx.conf # Including *location* directives from a dedicated config-folder into the - # server directive is, what what fedora and centos (already) does. + # server directive is, what fedora and centos (already) does. NGINX_APPS_ENABLED="/etc/nginx/default.d" # We add a apps-available folder and linking configurations into the @@ -692,7 +692,7 @@ nginx_reload() { nginx_install_app() { - # usage: nginx_install_app [<template option> ...] <myapp> + # usage: nginx_install_app [<template option> ...] <myapp.conf> # # <template option>: see install_template @@ -1381,7 +1381,7 @@ in_container() { LXC_ENV_FOLDER= if in_container; then # shellcheck disable=SC2034 - LXC_ENV_FOLDER="lxc/$(hostname)/" + LXC_ENV_FOLDER="lxc-env/$(hostname)/" fi lxc_init_container_env() { @@ -1413,8 +1413,8 @@ LXC_BASE_PACKAGES_centos="bash git python3" case $DIST_ID in ubuntu|debian) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_debian}" ;; arch) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_arch}" ;; - fedora) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_fedora}" ;; - centos) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_centos}" ;; + fedora) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_fedora}" ;; + centos) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_centos}" ;; *) err_msg "$DIST_ID-$DIST_VERS: pkg_install LXC_BASE_PACKAGES not yet implemented" ;; esac |