FIX #855 Syntax Error on RPM Uninstall (#860)

sbt · Aug 7, 2016 · 4e83b83 · 4e83b83
1 parent d474fd7
commit 4e83b83
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/src/main/resources/com/typesafe/sbt/packager/archetypes/java_server/rpm/postun-template b/src/main/resources/com/typesafe/sbt/packager/archetypes/java_server/rpm/postun-template
@@ -10,11 +10,12 @@ then
     echo "Try deleting system user and group [${{daemon_user}}:${{daemon_group}}]"
     if getent passwd | grep -q "^${{daemon_user}}:";
     then
-	echo "Deleting system user: ${{daemon_user}}"
-	deleteUser ${{daemon_user}}
+	    echo "Deleting system user: ${{daemon_user}}"
+	    deleteUser ${{daemon_user}}
     fi
     if getent group | grep -q "^${{daemon_group}}:" ;
     then
-	echo "Deleting system group: ${{daemon_group}}"
-	deleteGroup ${{daemon_group}}
+	    echo "Deleting system group: ${{daemon_group}}"
+	    deleteGroup ${{daemon_group}}
+    fi
 fi
diff --git a/src/main/scala/com/typesafe/sbt/packager/archetypes/systemloader/SystemloaderPlugin.scala b/src/main/scala/com/typesafe/sbt/packager/archetypes/systemloader/SystemloaderPlugin.scala
@@ -92,11 +92,11 @@ object SystemloaderPlugin extends AutoPlugin {
       maintainerScripts.value,
       linuxScriptReplacements.value
     )(
-      DebianConstants.Postinst -> s"""|# ${serverLoading.value} support
+      DebianConstants.Postinst -> s"""|# ${getOrUnsupported(serverLoading.value)} support
                                         |$${{loader-functions}}
                                         |${addAndStartService(serviceAutostart.value)}
                                         |""".stripMargin,
-      DebianConstants.Prerm -> s"""|# ${serverLoading.value} support
+      DebianConstants.Prerm -> s"""|# ${getOrUnsupported(serverLoading.value)} support
                                      |$${{loader-functions}}
                                      |stopService $${{app_name}} || echo "$${{app_name}} wasn't even running!"
                                      |""".stripMargin
@@ -109,7 +109,7 @@ object SystemloaderPlugin extends AutoPlugin {
       maintainerScripts.value,
       linuxScriptReplacements.value
     )(
-      RpmConstants.Post -> s"""|# ${serverLoading.value} support
+      RpmConstants.Post -> s"""|# ${getOrUnsupported(serverLoading.value)} support
                                  |$${{loader-functions}}
                                  |# Scriptlet syntax: http://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Syntax
                                  |# $$1 == 1 is first installation and $$1 == 2 is upgrade
@@ -118,12 +118,13 @@ object SystemloaderPlugin extends AutoPlugin {
                                  |${addAndStartService(serviceAutostart.value, "  ")}
                                  |fi
                                  |""".stripMargin,
-      RpmConstants.Postun -> s"""|# ${serverLoading.value} support
-                                   |if [ $$1 -ge 1 ]
+      RpmConstants.Postun -> s"""|# ${getOrUnsupported(serverLoading.value)} support
+                                   |if [ $$1 -ge 1 ] ;
+                                   |then
                                    |  restartService $${{app_name}} || echo "Failed to try-restart $${{app_name}}"
                                    |fi
                                    |""".stripMargin,
-      RpmConstants.Preun -> s"""|# ${serverLoading.value} support
+      RpmConstants.Preun -> s"""|# ${getOrUnsupported(serverLoading.value)} support
                                   |$${{loader-functions}}
                                   |if [ $$1 -eq 0 ] ;
                                   |then
@@ -162,4 +163,6 @@ object SystemloaderPlugin extends AutoPlugin {
     )
   }
 
+  private def getOrUnsupported(serverLoader: Option[ServerLoader]): String = serverLoader.map(_.toString).getOrElse("No system loader")
+
 }
diff --git a/src/sbt-test/rpm/sysvinit-rpm/build.sbt b/src/sbt-test/rpm/sysvinit-rpm/build.sbt
@@ -1,3 +1,5 @@
+
+
 enablePlugins(JavaServerAppPackaging, SystemVPlugin)
 
 name := "rpm-test"
@@ -40,7 +42,6 @@ TaskKey[Unit]("unzipAndCheck") <<= (baseDirectory, packageBin in Rpm, streams) m
 
 TaskKey[Unit]("check-spec-file") <<= (target, streams) map { (target, out) =>
     val spec = IO.read(target / "rpm" / "SPECS" / "rpm-test.spec")
-    println(spec)
     assert(spec contains "addGroup rpm-test", "addGroup not present in \n" + spec)
     assert(spec contains "addUser rpm-test", "Incorrect useradd command in \n" + spec)
     assert(spec contains "deleteGroup rpm-test", "deleteGroup not present in \n" + spec)
@@ -126,7 +127,6 @@ TaskKey[Unit]("check-spec-file") <<= (target, streams) map { (target, out) =>
 
 TaskKey[Unit]("check-spec-autostart") <<= (target, streams) map { (target, out) =>
     val spec = IO.read(target / "rpm" / "SPECS" / "rpm-test.spec")
-    println(spec)
     assert(spec contains
       """
         |# Scriptlet syntax: http://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Syntax
@@ -141,9 +141,8 @@ TaskKey[Unit]("check-spec-autostart") <<= (target, streams) map { (target, out)
     ()
 }
 
-TaskKey[Unit]("check-spec-no-autostart") <<= (target, streams) map { (target, out) =>
-    val spec = IO.read(target / "rpm" / "SPECS" / "rpm-test.spec")
-    println(spec)
+TaskKey[Unit]("check-spec-no-autostart") := {
+    val spec = IO.read(target.value / "rpm" / "SPECS" / "rpm-test.spec")
     assert(spec contains
       """
         |# Scriptlet syntax: http://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Syntax