[IMP] script install: quiet poetry/repo by default, EL_VERBOSE to opt in
Installation was very noisy: poetry ran "install -vvv" and repo sync / git daemon ran with -v/--verbose. They are now quiet by default (poetry -q, repo sync -q, no git daemon --verbose) and the detailed logs come back only when EL_VERBOSE=1. Applied to install_locally.sh (poetry) and every manifest script (repo sync + git daemon). env_var.sh documents EL_VERBOSE and respects a value already set in the environment, so "EL_VERBOSE=1 make install_odoo_18" works. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
65a0d6f907
commit
0aa84ed1e3
8 changed files with 71 additions and 11 deletions
|
|
@ -33,3 +33,7 @@ EL_GITHUB_TOKEN=""
|
|||
EL_MANIFEST_PROD="./default.xml"
|
||||
EL_MANIFEST_DEV="./manifest/git_manifest_erplibre.xml"
|
||||
EL_LANG="fr"
|
||||
# Verbosité de l'installation (poetry install, repo sync, git daemon).
|
||||
# 0 = silencieux (défaut), 1 = logs détaillés. On respecte une valeur déjà
|
||||
# passée en environnement : EL_VERBOSE=1 make install_odoo_18
|
||||
EL_VERBOSE="${EL_VERBOSE:-0}"
|
||||
|
|
|
|||
|
|
@ -22,6 +22,14 @@ VENV_ODOO_PATH=".venv.${EL_ERPLIBRE_VERSION}"
|
|||
POETRY_ODOO_PATH=${VENV_ERPLIBRE_PATH}/bin/poetry
|
||||
export WITH_POETRY_INSTALLATION=1
|
||||
|
||||
# Verbosité de l'installation Poetry : silencieuse (-q) par défaut, les logs
|
||||
# détaillés (-vvv) reviennent avec la variable d'environnement EL_VERBOSE=1.
|
||||
if [[ "${EL_VERBOSE:-0}" == "1" ]]; then
|
||||
POETRY_VERBOSE="-vvv"
|
||||
else
|
||||
POETRY_VERBOSE="-q"
|
||||
fi
|
||||
|
||||
# EL_PHASE controls which steps to execute. Used by install_locally_dev.sh
|
||||
# for parallel installation — do not set manually unless you know what you do.
|
||||
# all (default) – full install: setup + poetry phases
|
||||
|
|
@ -83,7 +91,7 @@ if [[ "${EL_PHASE}" != "setup" ]]; then
|
|||
# To fix keyring problem when installation is blocked, use
|
||||
export PYTHON_KEYRING_BACKEND=keyring.backends.null.Keyring
|
||||
if [[ ${WITH_POETRY_INSTALLATION} -ne 0 ]]; then
|
||||
poetry install --no-root -vvv
|
||||
poetry install --no-root ${POETRY_VERBOSE}
|
||||
fi
|
||||
retVal=$?
|
||||
if [[ $retVal -ne 0 ]]; then
|
||||
|
|
|
|||
|
|
@ -2,6 +2,14 @@
|
|||
|
||||
. ./env_var.sh
|
||||
|
||||
# Verbosité de l'installation (git-repo). Silencieuse par défaut ;
|
||||
# EL_VERBOSE=1 rétablit les logs détaillés (repo sync, git daemon).
|
||||
if [ "${EL_VERBOSE:-0}" = "1" ]; then
|
||||
REPO_VERBOSE="-v"; DAEMON_VERBOSE="--verbose"
|
||||
else
|
||||
REPO_VERBOSE="-q"; DAEMON_VERBOSE=""
|
||||
fi
|
||||
|
||||
#EL_MANIFEST_PROD="./default.xml"
|
||||
#EL_MANIFEST_DEV="./manifest/default.dev.xml"
|
||||
|
||||
|
|
@ -10,4 +18,4 @@
|
|||
|
||||
# Update git-repo
|
||||
.venv.erplibre/bin/repo init -u https://github.com/ERPLibre/ERPLibre -b $(git rev-parse --verify HEAD) -m ${EL_MANIFEST_DEV}
|
||||
.venv.erplibre/bin/repo sync -v
|
||||
.venv.erplibre/bin/repo sync ${REPO_VERBOSE}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,19 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
. ./env_var.sh
|
||||
|
||||
# Verbosité de l'installation (git-repo). Silencieuse par défaut ;
|
||||
# EL_VERBOSE=1 rétablit les logs détaillés (repo sync, git daemon).
|
||||
if [ "${EL_VERBOSE:-0}" = "1" ]; then
|
||||
REPO_VERBOSE="-v"; DAEMON_VERBOSE="--verbose"
|
||||
else
|
||||
REPO_VERBOSE="-q"; DAEMON_VERBOSE=""
|
||||
fi
|
||||
#EL_MANIFEST_PROD="./default.xml"
|
||||
#EL_MANIFEST_DEV="./manifest/default.dev.xml"
|
||||
|
||||
# Update git-repo
|
||||
git daemon --base-path=. --export-all --reuseaddr --informative-errors --verbose &
|
||||
git daemon --base-path=. --export-all --reuseaddr --informative-errors ${DAEMON_VERBOSE} &
|
||||
DAEMON_PID=$!
|
||||
|
||||
if [ -L "$EL_MANIFEST_DEV" ]; then
|
||||
|
|
@ -24,6 +32,6 @@ fi
|
|||
.venv.erplibre/bin/python ./script/git/git_merge_repo_manifest.py --output .repo/local_manifests/erplibre_manifest.xml --with_OCA
|
||||
|
||||
.venv.erplibre/bin/repo init -u git://127.0.0.1:9418/ -b $(git rev-parse --verify HEAD) -m ${MANIFEST_TARGET} "$@"
|
||||
.venv.erplibre/bin/repo sync -c -j "$JOBS" -v -m ${MANIFEST_TARGET}
|
||||
.venv.erplibre/bin/repo sync -c -j "$JOBS" ${REPO_VERBOSE} -m ${MANIFEST_TARGET}
|
||||
|
||||
kill ${DAEMON_PID}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,19 @@
|
|||
|
||||
. ./env_var.sh
|
||||
|
||||
# Verbosité de l'installation (git-repo). Silencieuse par défaut ;
|
||||
# EL_VERBOSE=1 rétablit les logs détaillés (repo sync, git daemon).
|
||||
if [ "${EL_VERBOSE:-0}" = "1" ]; then
|
||||
REPO_VERBOSE="-v"; DAEMON_VERBOSE="--verbose"
|
||||
else
|
||||
REPO_VERBOSE="-q"; DAEMON_VERBOSE=""
|
||||
fi
|
||||
|
||||
#EL_MANIFEST_PROD="./default.xml"
|
||||
#EL_MANIFEST_DEV="./manifest/default.dev.xml"
|
||||
|
||||
# Update git-repo
|
||||
git daemon --base-path=. --export-all --reuseaddr --informative-errors --verbose &
|
||||
git daemon --base-path=. --export-all --reuseaddr --informative-errors ${DAEMON_VERBOSE} &
|
||||
DAEMON_PID=$!
|
||||
|
||||
if [ -L "$EL_MANIFEST_DEV" ]; then
|
||||
|
|
@ -25,6 +33,6 @@ fi
|
|||
.venv.erplibre/bin/python ./script/git/git_merge_repo_manifest.py --output .repo/local_manifests/erplibre_manifest.xml --with_OCA
|
||||
|
||||
.venv.erplibre/bin/repo init -u git://127.0.0.1:9418/ -b $(git rev-parse --verify HEAD) -m ${MANIFEST_TARGET} -g base,code_generator
|
||||
.venv.erplibre/bin/repo sync -c -j "$JOBS" -v -m ${MANIFEST_TARGET}
|
||||
.venv.erplibre/bin/repo sync -c -j "$JOBS" ${REPO_VERBOSE} -m ${MANIFEST_TARGET}
|
||||
|
||||
kill ${DAEMON_PID}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,19 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
. ./env_var.sh
|
||||
|
||||
# Verbosité de l'installation (git-repo). Silencieuse par défaut ;
|
||||
# EL_VERBOSE=1 rétablit les logs détaillés (repo sync, git daemon).
|
||||
if [ "${EL_VERBOSE:-0}" = "1" ]; then
|
||||
REPO_VERBOSE="-v"; DAEMON_VERBOSE="--verbose"
|
||||
else
|
||||
REPO_VERBOSE="-q"; DAEMON_VERBOSE=""
|
||||
fi
|
||||
#EL_MANIFEST_PROD="./default.xml"
|
||||
#EL_MANIFEST_DEV="./manifest/default.dev.xml"
|
||||
|
||||
# Update git-repo
|
||||
git daemon --base-path=. --export-all --reuseaddr --informative-errors --verbose &
|
||||
git daemon --base-path=. --export-all --reuseaddr --informative-errors ${DAEMON_VERBOSE} &
|
||||
DAEMON_PID=$!
|
||||
|
||||
if [ -L "$EL_MANIFEST_DEV" ]; then
|
||||
|
|
@ -24,6 +32,6 @@ fi
|
|||
.venv.erplibre/bin/python ./script/git/git_merge_repo_manifest.py --output .repo/local_manifests/erplibre_manifest.xml --with_mobile
|
||||
|
||||
.venv.erplibre/bin/repo init -u git://127.0.0.1:9418/ -b $(git rev-parse --verify HEAD) -m ${MANIFEST_TARGET} "$@"
|
||||
.venv.erplibre/bin/repo sync -c -j "$JOBS" -v -m ${MANIFEST_TARGET}
|
||||
.venv.erplibre/bin/repo sync -c -j "$JOBS" ${REPO_VERBOSE} -m ${MANIFEST_TARGET}
|
||||
|
||||
kill ${DAEMON_PID}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,19 @@
|
|||
|
||||
. ./env_var.sh
|
||||
|
||||
# Verbosité de l'installation (git-repo). Silencieuse par défaut ;
|
||||
# EL_VERBOSE=1 rétablit les logs détaillés (repo sync, git daemon).
|
||||
if [ "${EL_VERBOSE:-0}" = "1" ]; then
|
||||
REPO_VERBOSE="-v"; DAEMON_VERBOSE="--verbose"
|
||||
else
|
||||
REPO_VERBOSE="-q"; DAEMON_VERBOSE=""
|
||||
fi
|
||||
|
||||
#EL_MANIFEST_PROD="./default.xml"
|
||||
#EL_MANIFEST_DEV="./manifest/default.dev.xml"
|
||||
|
||||
# Update git-repo
|
||||
git daemon --base-path=. --export-all --reuseaddr --informative-errors --verbose &
|
||||
git daemon --base-path=. --export-all --reuseaddr --informative-errors ${DAEMON_VERBOSE} &
|
||||
DAEMON_PID=$!
|
||||
|
||||
if [ -L "$EL_MANIFEST_DEV" ]; then
|
||||
|
|
@ -25,6 +33,6 @@ fi
|
|||
.venv.erplibre/bin/python ./script/git/git_merge_repo_manifest.py --output .repo/local_manifests/erplibre_manifest.xml --with_OCA
|
||||
|
||||
.venv.erplibre/bin/repo init -u git://127.0.0.1:9418/ -b $(git rev-parse --verify HEAD) -m ${MANIFEST_TARGET}
|
||||
.venv.erplibre/bin/repo sync -c -j "$JOBS" -v -m ${MANIFEST_TARGET}
|
||||
.venv.erplibre/bin/repo sync -c -j "$JOBS" ${REPO_VERBOSE} -m ${MANIFEST_TARGET}
|
||||
|
||||
kill ${DAEMON_PID}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,14 @@
|
|||
|
||||
. ./env_var.sh
|
||||
|
||||
# Verbosité de l'installation (git-repo). Silencieuse par défaut ;
|
||||
# EL_VERBOSE=1 rétablit les logs détaillés (repo sync, git daemon).
|
||||
if [ "${EL_VERBOSE:-0}" = "1" ]; then
|
||||
REPO_VERBOSE="-v"; DAEMON_VERBOSE="--verbose"
|
||||
else
|
||||
REPO_VERBOSE="-q"; DAEMON_VERBOSE=""
|
||||
fi
|
||||
|
||||
#EL_MANIFEST_PROD="./default.xml"
|
||||
#EL_MANIFEST_DEV="./manifest/default.dev.xml"
|
||||
|
||||
|
|
@ -16,4 +24,4 @@ fi
|
|||
|
||||
# Update git-repo
|
||||
.venv.erplibre/bin/repo init -u https://github.com/ERPLibre/ERPLibre -b $(git rev-parse --verify HEAD)
|
||||
.venv.erplibre/bin/repo sync -v -j "$JOBS"
|
||||
.venv.erplibre/bin/repo sync ${REPO_VERBOSE} -j "$JOBS"
|
||||
|
|
|
|||
Loading…
Reference in a new issue