From 724e5261254a385a852dfd5bb51139c2a4c4bb87 Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Fri, 18 Dec 2020 18:54:50 -0500 Subject: [PATCH] move git submodule init to cobbzilla-parent --- bin/jvc_common | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/jvc_common b/bin/jvc_common index b2ef1ff..4f51c65 100755 --- a/bin/jvc_common +++ b/bin/jvc_common @@ -63,18 +63,18 @@ if [[ -z "${JVC_JAR}" ]] ; then # Build and install utility libraries pushd "${JVC_DIR}"/utils/cobbzilla-parent || die "Error changing directories to ${JVC_DIR}/utils/cobbzilla-parent" + if [[ -z "$(find . -type f)" ]] ; then + cd ../.. && \ + ./bin/use_https_submodules && \ + git submodule update --init --recursive && \ + cd - \ + || die "Error updating git submodule" + fi mvn install || die "Error installing cobbzilla-parent" popd || die "popd error (pwd=$(pwd))" pushd "${JVC_DIR}"/utils/cobbzilla-utils || die "Error changing directories to ${JVC_DIR}/utils/cobbzilla-utils" if [[ -z "$(find target -type f -name "*.jar")" ]] ; then - if [[ -z "$(find . -type f)" ]] ; then - cd ../.. && \ - ./bin/use_https_submodules && \ - git submodule update --init --recursive && \ - cd - \ - || die "Error updating git submodule" - fi mvn -DskipTests=true clean install || die "Error building cobbzilla-utils library" fi popd || die "popd error (pwd=$(pwd))"