From: Jiang Xin Date: Thu, 24 Nov 2022 15:39:32 GMT Subject: [PATCH v3 2/4] ci: show error message of "p4 -V" Message-ID: <20221124153934.12470-3-worldhello.net@gmail.com> In-Reply-To: <20221124090545.4790-1-worldhello.net@gmail.com> From: Jiang Xin When installing p4 as a dependency, we used to pipe output of "p4 -V" to validate the installation, but this would hide potential errors of p4. E.g.: A broken p4 installation fails to run. Add some instructions to show errors of command "p4 -V", so we can see why the command output doesn't match. Reviewed-by: Johannes Schindelin Signed-off-by: Jiang Xin --- ci/install-dependencies.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index f639263a62..291e49bdde 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -83,9 +83,9 @@ esac if type p4d >/dev/null 2>&1 && type p4 >/dev/null 2>&1 then echo "$(tput setaf 6)Perforce Server Version$(tput sgr0)" - p4d -V | grep Rev. + p4d -V | grep Rev. || { echo >&2 "p4d: bad version"; p4d -V; exit 1; } echo "$(tput setaf 6)Perforce Client Version$(tput sgr0)" - p4 -V | grep Rev. + p4 -V | grep Rev. || { echo >&2 "p4: bad version"; p4 -V; exit 1; } else echo >&2 "WARNING: perforce wasn't installed, see above for clues why" fi -- 2.39.0.rc0