Improved validation of wazuh-installation-assistant repository

wazuh · Aug 26, 2024 · 5833557 · 5833557
1 parent d6a395e
commit 5833557
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/ova/generate_ova.sh b/ova/generate_ova.sh
@@ -228,20 +228,21 @@ main() {
 
     INSTALLER="wazuh-install.sh"
     WAZUH_INSTALLATION_ASSISTANT="wazuh-installation-assistant"
+    WAZUH_INSTALLATION_ASSISTANT_URL="https://github.com/wazuh/${WAZUH_INSTALLATION_ASSISTANT}.git"
     BUILDER_ARGS="-i"
+
     if [[ "${PACKAGES_REPOSITORY}" == "dev" ]]; then
         BUILDER_ARGS+=" -d"
     elif [[ "${PACKAGES_REPOSITORY}" == "staging" ]]; then
         BUILDER_ARGS+=" -d staging"
     fi
 
     echo "Building Wazuh OVA version ${OVA_VERSION}"
-    echo "Cloning Wazuh installation assistant repository"
-    git clone https://github.com/wazuh/${WAZUH_INSTALLATION_ASSISTANT}.git >> /dev/null 2>&1
-    cd ${WAZUH_INSTALLATION_ASSISTANT}
-    if git ls-remote ${REMOTE_TYPE} origin ${INSTALLATION_ASSISTANT_BRANCH} | grep -q "${INSTALLATION_ASSISTANT_BRANCH}"; then
+    if git ls-remote ${REMOTE_TYPE} ${WAZUH_INSTALLATION_ASSISTANT_URL} ${INSTALLATION_ASSISTANT_BRANCH} | grep -q "${INSTALLATION_ASSISTANT_BRANCH}"; then
+        echo "Cloning Wazuh installation assistant repository"
+        git clone ${WAZUH_INSTALLATION_ASSISTANT_URL} -b ${INSTALLATION_ASSISTANT_BRANCH} >> /dev/null 2>&1
         echo "Using ${INSTALLATION_ASSISTANT_BRANCH} branch of ${WAZUH_INSTALLATION_ASSISTANT} repository"
-        git checkout ${INSTALLATION_ASSISTANT_BRANCH} >> /dev/null 2>&1
+        cd ${WAZUH_INSTALLATION_ASSISTANT}
         WIA_VERSION=$(cat VERSION)
         if [ "${OVA_VERSION}" != "${WIA_VERSION}" ]; then
             echo "Wazuh installation assistant version ${WIA_VERSION} does not match with OVA version ${OVA_VERSION}"