Ensure application is running on the installed directory in the RPM-b…

…ased distribution Reinstate the fix in PR #653 that was accidentally removed by PR #661
sbt · Sep 10, 2015 · d3ae71f · d3ae71f
1 parent f8fbfd1
commit d3ae71f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/.../com/typesafe/sbt/packager/archetypes/java_server/systemloader/systemv/start-rpm-template b/.../com/typesafe/sbt/packager/archetypes/java_server/systemloader/systemv/start-rpm-template
@@ -38,6 +38,7 @@
 
 INSTALL_DIR="${{chdir}}"
 [ -n "${PACKAGE_PREFIX}" ] && INSTALL_DIR="${PACKAGE_PREFIX}/${{app_name}}"
+cd $INSTALL_DIR
 
 exec="$INSTALL_DIR/bin/${{exec}}"
 prog="${{app_name}}"

diff --git a/src/sbt-test/rpm/sysvinit-rpm/build.sbt b/src/sbt-test/rpm/sysvinit-rpm/build.sbt
@@ -32,6 +32,12 @@ TaskKey[Unit]("unzipAndCheck") <<= (baseDirectory, packageBin in Rpm, streams) m
     assert(scriptlets contains "deleteUser rpm-test", "deleteUser rpm not present in \n" + scriptlets)
 
     val startupScript = IO.read(baseDir / "etc" / "init.d" / "rpm-test")
+    assert(startupScript contains
+      """
+        |INSTALL_DIR="/usr/share/rpm-test"
+        |[ -n "${PACKAGE_PREFIX}" ] && INSTALL_DIR="${PACKAGE_PREFIX}/rpm-test"
+        |cd $INSTALL_DIR
+        |""".stripMargin, "Ensuring application is running on the install directory is not present in \n" + startupScript)
     assert(startupScript contains """RUN_CMD="$exec >> /var/log/rpm-test/test.log 2>&1 &"""", "Setting key rpmDaemonLogFile not present in \n" + startupScript)
 
     // TODO check symlinks