Fixing error with brpJavaRepack setting and add regression test

sbt · Apr 10, 2014 · d76f6f3 · d76f6f3
1 parent 3b7c243
commit d76f6f3
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 1 deletion.
diff --git a/src/main/scala/com/typesafe/sbt/packager/rpm/RpmPlugin.scala b/src/main/scala/com/typesafe/sbt/packager/rpm/RpmPlugin.scala
@@ -52,7 +52,7 @@ trait RpmPlugin extends Plugin with LinuxPlugin {
       rpmDependencies <<=
         (rpmProvides, rpmRequirements, rpmPrerequisites, rpmObsoletes, rpmConflicts) apply RpmDependencies,
       rpmPre <<= (rpmPre, rpmBrpJavaRepackJars) apply {
-        case (_, true) => None
+        case (pre, true) => pre
         case (pre, false) =>
           val scriptBits = IO.readStream(RpmPlugin.osPostInstallMacro.openStream, Charset forName "UTF-8")
           Some(pre.map(_ + "\n").getOrElse("") + scriptBits)

diff --git a/src/sbt-test/rpm/scriptlets-override-build-rpm/test b/src/sbt-test/rpm/scriptlets-override-build-rpm/test
@@ -5,3 +5,5 @@ $ exists target/rpm/SPECS/rpm-test.spec
 
 # Check files for defaults
 > check-spec-file
+> set NativePackagerKeys.rpmBrpJavaRepackJars := true
+> check-spec-file
diff --git a/src/sbt-test/rpm/scriptlets-override-rpm/build.sbt b/src/sbt-test/rpm/scriptlets-override-rpm/build.sbt
@@ -33,3 +33,12 @@ TaskKey[Unit]("unzipAndCheck") <<= (packageBin in Rpm, streams) map { (rpmFile,
     ()
 }
 
+TaskKey[Unit]("check-spec-file") <<= (target, streams) map { (target, out) =>
+    val spec = IO.read(target / "rpm" / "SPECS" / "rpm-test.spec")
+    assert(spec contains "echo postinst", "'echo 'postinst' not present in \n" + spec)
+    assert(spec contains "echo preinst", "'echo 'preinst' not present in \n" + spec)
+    assert(spec contains "echo postun", "'echo 'postun' not present in \n" + spec)
+    assert(spec contains "echo preun", "'echo 'preun' not present in \n" + spec)
+    ()
+}
+
diff --git a/src/sbt-test/rpm/scriptlets-override-rpm/test b/src/sbt-test/rpm/scriptlets-override-rpm/test
@@ -18,3 +18,8 @@ $ exists var/log/rpm-test
 $ exists var/run/rpm-test
 
 # TODO symlinks aren't checked
+
+> check-spec-file
+> set NativePackagerKeys.rpmBrpJavaRepackJars := true
+> check-spec-file
+
diff --git a/src/sbt-test/rpm/scriptlets-rpm/test b/src/sbt-test/rpm/scriptlets-rpm/test
@@ -6,3 +6,5 @@ $ exists target/rpm/SPECS/rpm-test.spec
 # Check files for defaults
 > check-spec-file
 > check-rpm-version
+> set NativePackagerKeys.rpmBrpJavaRepackJars := true
+> check-spec-file
diff --git a/src/sbt-test/rpm/sysvinit-rpm/build.sbt b/src/sbt-test/rpm/sysvinit-rpm/build.sbt
@@ -34,3 +34,11 @@ TaskKey[Unit]("unzipAndCheck") <<= (packageBin in Rpm, streams) map { (rpmFile,
     ()
 }
 
+TaskKey[Unit]("check-spec-file") <<= (target, streams) map { (target, out) =>
+    val spec = IO.read(target / "rpm" / "SPECS" / "rpm-test.spec")
+    assert(spec contains "groupadd --system rpm-test", "groupadd not present in \n" + spec)
+    assert(spec contains "useradd --gid rpm-test --no-create-home --system -c 'Test rpm package' rpm-test", "Incorrect useradd command in \n" + spec)
+    assert(spec contains "groupdel rpm-test", "groupdel not present in \n" + spec)
+    assert(spec contains "userdel rpm-test", "userdel rpm not present in \n" + spec)
+    ()
+}
diff --git a/src/sbt-test/rpm/sysvinit-rpm/test b/src/sbt-test/rpm/sysvinit-rpm/test
@@ -2,6 +2,8 @@
 > rpm:package-bin
 $ exists target/rpm/RPMS/noarch/rpm-test-0.1.0-1.noarch.rpm
 
+> check-spec-file
+
 # Check rpm contents
 > unzipAndCheck
 $ exists etc/default/rpm-test
@@ -19,3 +21,6 @@ $ exists var/log/rpm-test
 $ exists var/run/rpm-test
 
 # TODO symlinks aren't checked
+
+> set NativePackagerKeys.rpmBrpJavaRepackJars := true
+> check-spec-file