sbt: trim output of password command

This commit is contained in:
Jakub Kozłowski 2021-11-22 18:15:40 +01:00 committed by Robert Helgesson
parent 418ae217dd
commit acf824c9ed
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
2 changed files with 3 additions and 3 deletions

View file

@ -9,7 +9,7 @@ let
''; '';
renderCredential = cred: '' renderCredential = cred: ''
credentials += Credentials("${cred.realm}", "${cred.host}", "${cred.user}", "${cred.passwordCommand}".lazyLines.mkString("\n")) credentials += Credentials("${cred.realm}", "${cred.host}", "${cred.user}", "${cred.passwordCommand}".!!.trim)
''; '';
renderCredentials = creds: '' renderCredentials = creds: ''

View file

@ -19,8 +19,8 @@ let
]; ];
expectedCredentialsSbt = pkgs.writeText "credentials.sbt" '' expectedCredentialsSbt = pkgs.writeText "credentials.sbt" ''
import scala.sys.process._ import scala.sys.process._
credentials += Credentials("Sonatype Nexus Repository Manager", "example.com", "user", "echo password".lazyLines.mkString("\n")) credentials += Credentials("Sonatype Nexus Repository Manager", "example.com", "user", "echo password".!!.trim)
credentials += Credentials("Sonatype Nexus Repository Manager X", "v2.example.com", "user1", "echo password1".lazyLines.mkString("\n")) credentials += Credentials("Sonatype Nexus Repository Manager X", "v2.example.com", "user1", "echo password1".!!.trim)
''; '';
credentialsSbtPath = ".sbt/1.0/credentials.sbt"; credentialsSbtPath = ".sbt/1.0/credentials.sbt";
in { in {