From 5b7e994b9326e6e9fe80b219dac927b3e2d475d1 Mon Sep 17 00:00:00 2001 From: Ron Izraeli Date: Tue, 30 Apr 2024 13:36:43 +0300 Subject: [PATCH] Update setup-frogbot-using-gitlab-ci.md getFrogbot.sh installation script URL for an Artifactory remote repository is incorrect. Adding the repository name to the official release path to support both cases. --- .../frogbot/setup-frogbot-using-gitlab-ci.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jfrog-applications/frogbot/setup-frogbot-using-gitlab-ci.md b/jfrog-applications/frogbot/setup-frogbot-using-gitlab-ci.md index 5f74293..6ac9a75 100644 --- a/jfrog-applications/frogbot/setup-frogbot-using-gitlab-ci.md +++ b/jfrog-applications/frogbot/setup-frogbot-using-gitlab-ci.md @@ -200,13 +200,13 @@ frogbot-scan: script: # For Linux / MacOS runner: - | - getFrogbotScriptPath=$(if [ -z "$JF_RELEASES_REPO" ]; then echo "https://releases.jfrog.io"; else echo "${JF_URL}/artifactory/${JF_RELEASES_REPO}"; fi) - curl -fLg "$getFrogbotScriptPath/artifactory/frogbot/v2/[RELEASE]/getFrogbot.sh" | sh + getFrogbotScriptPath=$(if [ -z "$JF_RELEASES_REPO" ]; then echo "https://releases.jfrog.io/artifactory/frogbot"; else echo "${JF_URL}/artifactory/${JF_RELEASES_REPO}"; fi) + curl -fLg "$getFrogbotScriptPath/v2/[RELEASE]/getFrogbot.sh" | sh ./frogbot ${FROGBOT_CMD} # For Windows runner: # - # - $getFrogbotScriptPath = $(if ([string]::IsNullOrEmpty($env:JF_RELEASES_REPO)) { "https://releases.jfrog.io" } else { "$($env:JF_URL)/artifactory/$($env:JF_RELEASES_REPO)" }) - # - Invoke-WebRequest -Uri "$getFrogbotScriptPath/artifactory/frogbot/v2/[RELEASE]/getFrogbot.sh" -UseBasicParsing | ForEach-Object { & $_.Content } + # - $getFrogbotScriptPath = $(if ([string]::IsNullOrEmpty($env:JF_RELEASES_REPO)) { "https://releases.jfrog.io/artifactory/frogbot" } else { "$($env:JF_URL)/artifactory/$($env:JF_RELEASES_REPO)" }) + # - Invoke-WebRequest -Uri "$getFrogbotScriptPath/v2/[RELEASE]/getFrogbot.sh" -UseBasicParsing | ForEach-Object { & $_.Content } # - .\frogbot ${FROGBOT_CMD} ```