diff options
| author | vlad <vlad@driver.xyz> | 2017-03-12 21:59:09 -0700 |
|---|---|---|
| committer | vlad <vlad@driver.xyz> | 2017-03-12 21:59:09 -0700 |
| commit | 86be23d97befbf95f9c9b9db8c9d13c555e69331 (patch) | |
| tree | f35d4902a8656d58727e4f1f8f2891c97efe4a2f | |
| parent | a8edaeab92cf3ee659c60ce58559ce6632f0c246 (diff) | |
| parent | f3fc7697baf388c464c2278c879fe39fe9b39f26 (diff) | |
| download | sbt-settings-86be23d97befbf95f9c9b9db8c9d13c555e69331.tar.gz sbt-settings-86be23d97befbf95f9c9b9db8c9d13c555e69331.tar.bz2 sbt-settings-86be23d97befbf95f9c9b9db8c9d13c555e69331.zip | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | src/main/scala/xyz.driver.sbt/SbtSettings.scala | 2 | ||||
| -rw-r--r-- | version.sbt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/scala/xyz.driver.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala index be27138..fb3e628 100644 --- a/src/main/scala/xyz.driver.sbt/SbtSettings.scala +++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala @@ -376,7 +376,7 @@ object SbtSettings extends AutoPlugin { s"keytool -import -noprompt -trustcacerts -alias driver-internal -file /etc/$imageName/ssl/issuing_ca -storepass 123456" val trustStoreConfiguration = - "if [ -n \"$TRUSTSTORE\" ] ; " + keytoolCommand + "; else echo \"No truststore customization.\"; fi" + "if [ -n \"$TRUSTSTORE\" ] ; then " + keytoolCommand + "; else echo \"No truststore customization.\"; fi" val dockerCommands = dockerCustomCommands :+ trustStoreConfiguration diff --git a/version.sbt b/version.sbt index 322cd2c..d1dd39b 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "0.6.14-SNAPSHOT" +version in ThisBuild := "0.6.15-SNAPSHOT" |