From cc6f39e8b8655c8f32851d80303e9f316378f7a6 Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jakob@driver.xyz>
Date: Thu, 9 Aug 2018 17:17:08 -0700
Subject: Apply launch script customizationas after bash plugin

---
 build.sbt                                         |  2 +-
 src/main/scala/xyz.driver.sbt/ServicePlugin.scala | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/build.sbt b/build.sbt
index 8ee9d9f..ae42a23 100644
--- a/build.sbt
+++ b/build.sbt
@@ -9,7 +9,7 @@ addSbtPlugin("org.scalastyle"  %% "scalastyle-sbt-plugin" % "1.0.0")
 addSbtPlugin("io.spray"          %% "sbt-revolver"        % "0.9.1")
 addSbtPlugin("com.eed3si9n"      %% "sbt-buildinfo"       % "0.9.0")
 addSbtPlugin("com.typesafe.sbt"  %% "sbt-git"             % "1.0.0")
-addSbtPlugin("com.typesafe.sbt"  %% "sbt-native-packager" % "1.3.4")
+addSbtPlugin("com.typesafe.sbt"  %% "sbt-native-packager" % "1.3.6")
 addSbtPlugin("com.github.gseitz" %% "sbt-release"         % "1.0.8")
 
 // the following prevents thousands of meaningless stacktraces by docker plugin on JDK 9
diff --git a/src/main/scala/xyz.driver.sbt/ServicePlugin.scala b/src/main/scala/xyz.driver.sbt/ServicePlugin.scala
index e48a78b..3925f79 100644
--- a/src/main/scala/xyz.driver.sbt/ServicePlugin.scala
+++ b/src/main/scala/xyz.driver.sbt/ServicePlugin.scala
@@ -4,6 +4,7 @@ import com.typesafe.sbt.GitPlugin.autoImport._
 import com.typesafe.sbt.SbtNativePackager.Universal
 import com.typesafe.sbt.packager.Keys._
 import com.typesafe.sbt.packager.archetypes.JavaAppPackaging
+import com.typesafe.sbt.packager.archetypes.scripts.BashStartScriptPlugin
 import com.typesafe.sbt.packager.docker.DockerPlugin.autoImport.Docker
 import com.typesafe.sbt.packager.docker.{Cmd, DockerPlugin}
 import java.time.Instant
@@ -15,7 +16,7 @@ import sbtbuildinfo.BuildInfoPlugin.autoImport._
 /** Common settings to a service. */
 object ServicePlugin extends AutoPlugin {
 
-  override def requires = BuildInfoPlugin && DockerPlugin && JavaAppPackaging
+  override def requires = BuildInfoPlugin && DockerPlugin && JavaAppPackaging && BashStartScriptPlugin
 
   object autoImport {
     val customCommands = taskKey[List[String]]("Additional commands that are run as part of docker packaging.")
@@ -46,11 +47,11 @@ object ServicePlugin extends AutoPlugin {
     },
     bashScriptExtraDefines += {
       s"""|if [[ -f /etc/${name.value}/ssl/issuing_ca ]]; then
-          |  keytool -import \
-          |    -alias driverincInternal \
-          |    -cacerts \
-          |    -file /etc/${name.value}/ssl/issuing_ca \
-          |    -storepass changeit -noprompt \
+          |  keytool -import \\
+          |    -alias driverincInternal \\
+          |    -cacerts \\
+          |    -file /etc/${name.value}/ssl/issuing_ca \\
+          |    -storepass changeit -noprompt \\
           |  || exit 1
           |else
           |  echo "No truststore customization." >&2
-- 
cgit v1.2.3