V.1.1 This is a fix for #812 (#835)

* add unique test for maintainer scripts

* merge duplicate fix

* Fix duplicate RPM scriptlet override (#825)

* set verstion to 1.1.2

Author: zoosky

src/main/scala/com/typesafe/sbt/packager/archetypes/JavaServerApplication.scala

@@ -369,7 +369,7 @@ object JavaServerAppPackaging extends AutoPlugin {
     val rpmScripts = Option(scriptDirectory.listFiles) getOrElse Array.empty
 
     // remove all non files and already processed templates
-    rpmScripts.diff(predefined).filter(_.isFile).foldLeft(predefinedScripts) {
+    rpmScripts.filter(s => s.isFile && !predefined.contains(s.getName)).foldLeft(predefinedScripts) {
       case (scripts, scriptlet) =>
         val script = scriptlet.getName
         val existingContent = scripts.getOrElse(script, Nil)

src/sbt-test/rpm/scriptlets-override-rpm/build.sbt

@@ -41,3 +41,18 @@ TaskKey[Unit]("check-spec-file") <<= (target, streams) map { (target, out) =>
     ()
 }
 
+def countSubstring(str: String, substr: String): Int =
+    substr.r.findAllMatchIn(str).length
+
+def isUnique(str: String, searchstr: String): Boolean =
+    countSubstring(str, searchstr) == 1
+
+TaskKey[Unit]("unique-scripts-in-spec-file") <<= (target, streams) map { (target, out) =>
+    val spec = IO.read(target / "rpm" / "SPECS" / "rpm-test.spec")
+    assert( isUnique(spec, "echo postinst"), "'echo 'postinst' not unique in \n" + spec)
+    assert( isUnique(spec, "echo preinst"), "'echo 'preinst' not unique in \n" + spec)
+    assert( isUnique(spec, "echo postun"), "'echo 'postun' not unique in \n" + spec)
+    assert( isUnique(spec, "echo preun"), "'echo 'preun' not unique in \n" + spec)
+    ()
+}
+

src/sbt-test/rpm/scriptlets-override-rpm/test

@@ -23,3 +23,4 @@ $ exists var/run/rpm-test
 > set NativePackagerKeys.rpmBrpJavaRepackJars := true
 > check-spec-file
 
+> unique-scripts-in-spec-file

version.sbt

@@ -1 +1 @@
-version in ThisBuild := "1.1.1"
+version in ThisBuild := "1.1.2"