From 8347a0bb09a2404ad1a5131d55309e9cb44b69ed Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 24 Apr 2021 20:26:18 -0400 Subject: [PATCH] Fix Linux package layout --- launcher-package/build.sbt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/launcher-package/build.sbt b/launcher-package/build.sbt index 45fc76b26..dee410f93 100755 --- a/launcher-package/build.sbt +++ b/launcher-package/build.sbt @@ -60,7 +60,7 @@ lazy val bintrayRpmExperimentalUrl = settingKey[String]("API point for RPM exper lazy val bintrayGenericPackagesUrl = settingKey[String]("API point for generic packages") lazy val bintrayTripple = settingKey[(String, String, String)]("id, url, and pattern") -val bintrayLinuxPattern = "[module]/[revision]/[module]-[revision].[ext]" +val artifactoryLinuxPattern = "[module]-[revision].[ext]" val bintrayGenericPattern = "[module]/[revision]/[module]/[revision]/[module]-[revision].[ext]" val bintrayReleaseAllStaged = TaskKey[Unit]("bintray-release-all-staged", "Release all staged artifacts on bintray.") val windowsBuildId = settingKey[Int]("build id for Windows installer") @@ -366,10 +366,10 @@ def makePublishToForConfig(config: Configuration) = { bintrayGenericPackagesUrl := s"https://scala.jfrog.io/artifactory/native-packages/", bintrayTripple := { config.name match { - case Debian.name if isExperimental => ("debian-experimental", bintrayDebianExperimentalUrl.value, bintrayLinuxPattern) - case Debian.name => ("debian", bintrayDebianUrl.value, bintrayLinuxPattern) - case Rpm.name if isExperimental => ("rpm-experimental", bintrayRpmExperimentalUrl.value, bintrayLinuxPattern) - case Rpm.name => ("rpm", bintrayRpmUrl.value, bintrayLinuxPattern) + case Debian.name if isExperimental => ("debian-experimental", bintrayDebianExperimentalUrl.value, artifactoryLinuxPattern) + case Debian.name => ("debian", bintrayDebianUrl.value, artifactoryLinuxPattern) + case Rpm.name if isExperimental => ("rpm-experimental", bintrayRpmExperimentalUrl.value, artifactoryLinuxPattern) + case Rpm.name => ("rpm", bintrayRpmUrl.value, artifactoryLinuxPattern) } }, publishTo := {