Currently, when using with --no-virtualenv, the script doesn't behave well, as it prints both instructions to install Sphinx via distribution's package manager and via pip. Address it. While here, rework the logic which recommends Sphinx install, by splitting it into three parts and making easier to maintain it, as there are too much complexity there. Splitting the Sphinx part of the logic on 3 separate functions allow to detect if the venv/virtualenv python packages are needed or not, and helps to have a cleaner logic. Mauro Carvalho Chehab (2): scripts: sphinx-pre-install: rework the sphinx install logic scripts: sphinx-pre-install: fix the need of virtenv packages scripts/sphinx-pre-install | 262 +++++++++++++++++++++++++------------ 1 file changed, 180 insertions(+), 82 deletions(-) -- 2.31.1