From 657a5f9786b52ad2f7fadb9bc9356fed526775d7 Mon Sep 17 00:00:00 2001 From: Mathieu Le Marec - Pasquet Date: Fri, 3 Oct 2025 20:00:39 +0300 Subject: [PATCH] finish 4.0 upgrade doc & cli --- README.md | 2 +- bin/install.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c382ef83..b4a730f1 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ We provide a semi-automatic way to proceed to ``4.0`` upgrade not to break old i # be sure to be on the latest changeset of the corpusops.bootstrap's local branch checkout cd $corpusops_bootstrap && \ git fetch origin && \ - ./bin/install.sh -C -b 4.0 --ansible-branch 2.17 && \ + ./bin/install.sh -C -b 4.0 --ansible-branch 2.17 --roles-branch 4.0 && \ bin/install.sh -C && \ rm -f .corpusops/*_branch ``` diff --git a/bin/install.sh b/bin/install.sh index 148a228f..86370c29 100755 --- a/bin/install.sh +++ b/bin/install.sh @@ -1620,6 +1620,7 @@ usage() { bs_help " -u|--use-venv yes/no" "do we use venv" "$(get_corpusops_use_venv)" y bs_help " --ansible-url " "ansible fork git url" "$(get_ansible_url)" y bs_help " --ansible-branch " "ansible fork git branch" "$(get_ansible_branch)" y + bs_help " --roles-branch " "corpusops ansible roles git branch" "$(get_corpusops_roles_branch)" y bs_help " -C|--no-confirm" "Do not ask for start confirmation" "" y bs_help " --no-colors" "No terminal colors" "${NO_COLORS}" y bs_help " -d|--debug" "activate debug" "${DEBUG}" y @@ -1723,6 +1724,9 @@ parse_cli_opts() { if [ "x${1}" = "x--ansible-branch" ]; then ANSIBLE_BRANCH="${2}";sh="2";argmatch="1" fi + if [ "x${1}" = "x--roles-branch" ]; then + CORPUSOPS_ROLES_BRANCH="${2}";sh="2";argmatch="1" + fi if [ "x${1}" = "x--upgrade" ]; then DO_UPGRADE="1";argmatch="1" fi