Merge pull request #6820 from tsawada/friendly-curl

launcher: debian package to depend on curl | wget
This commit is contained in:
eugene yokota 2022-02-21 23:39:41 -05:00 committed by GitHub
commit 18882088cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions

View File

@ -191,7 +191,7 @@ val root = (project in file(".")).
},
// Used to have "openjdk-8-jdk" but that doesn't work on Ubuntu 14.04 https://github.com/sbt/sbt/issues/3105
// before that we had java6-runtime-headless" and that was pulling in JDK9 on Ubuntu 16.04 https://github.com/sbt/sbt/issues/2931
debianPackageDependencies in Debian ++= Seq("bash (>= 3.2)"),
debianPackageDependencies in Debian ++= Seq("bash (>= 3.2)", "curl | wget"),
debianPackageRecommends in Debian += "git",
linuxPackageMappings in Debian += {
val bd = sourceDirectory.value

3
sbt
View File

@ -123,6 +123,9 @@ download_url () {
curl --silent -L "$url" --output "$jar"
elif command -v wget > /dev/null; then
wget --quiet -O "$jar" "$url"
else
echoerr "failed to download $url: Neither curl nor wget is avaialble"
exit 2
fi
} && [[ -f "$jar" ]]
}