From cdd49ab8eeea4a649aa057ec1172a1f48a2df721 Mon Sep 17 00:00:00 2001 From: "Dmitriy.Panov" Date: Thu, 14 May 2020 14:14:42 +0300 Subject: [PATCH] use cache-redirector for bintray GitOrigin-RevId: 07fcabd3da44a9c35a54dad93b037b6ab089e7d2 --- .../src/com/intellij/sh/shellcheck/ShShellcheckUtil.java | 2 +- .../com/intellij/sh/shellcheck/ShShellcheckTestUtil.java | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/plugins/sh/src/com/intellij/sh/shellcheck/ShShellcheckUtil.java b/plugins/sh/src/com/intellij/sh/shellcheck/ShShellcheckUtil.java index 6a1cfac7f04e..cc5a6316f2ab 100644 --- a/plugins/sh/src/com/intellij/sh/shellcheck/ShShellcheckUtil.java +++ b/plugins/sh/src/com/intellij/sh/shellcheck/ShShellcheckUtil.java @@ -40,7 +40,7 @@ class ShShellcheckUtil { static final String SHELLCHECK = "shellcheck"; static final String SHELLCHECK_VERSION = "0.6.0-1"; static final String SHELLCHECK_ARCHIVE_EXTENSION = ".tar.gz"; - static final String SHELLCHECK_URL = "https://jetbrains.bintray.com/" + + static final String SHELLCHECK_URL = "https://cache-redirector.jetbrains.com/jetbrains.bintray.com/" + "intellij-third-party-dependencies/" + "org/jetbrains/intellij/deps/shellcheck/"; private static final String DOWNLOAD_PATH = PathManager.getPluginsPath() + File.separator + ShLanguage.INSTANCE.getID(); diff --git a/plugins/sh/tests/com/intellij/sh/shellcheck/ShShellcheckTestUtil.java b/plugins/sh/tests/com/intellij/sh/shellcheck/ShShellcheckTestUtil.java index ebb8715f2d93..17c7f467fcdb 100644 --- a/plugins/sh/tests/com/intellij/sh/shellcheck/ShShellcheckTestUtil.java +++ b/plugins/sh/tests/com/intellij/sh/shellcheck/ShShellcheckTestUtil.java @@ -26,10 +26,6 @@ import static com.intellij.testFramework.UsefulTestCase.IS_UNDER_TEAMCITY; class ShShellcheckTestUtil { protected static final Logger LOG = Logger.getInstance(ShShellcheckTestUtil.class); - private static final String CACHE_SHELLCHECK_URL = "https://cache-redirector.jetbrains.com/jetbrains.bintray.com/" + - "intellij-third-party-dependencies/" + - "org/jetbrains/intellij/deps/shellcheck/"; - static void downloadShellcheck() { String downloadPath = getShellcheckTestDir(); File directory = new File(downloadPath); @@ -81,8 +77,7 @@ class ShShellcheckTestUtil { private static String getShellcheckDistributionLink() { String platform = SystemInfo.isMac ? "mac" : SystemInfo.isWindows ? "windows" : "linux"; - String shellcheckUrl = IS_UNDER_TEAMCITY ? CACHE_SHELLCHECK_URL : SHELLCHECK_URL; - return shellcheckUrl + SHELLCHECK_VERSION + "/" + platform + SHELLCHECK_ARCHIVE_EXTENSION; + return SHELLCHECK_URL + SHELLCHECK_VERSION + "/" + platform + SHELLCHECK_ARCHIVE_EXTENSION; } @NotNull