Merge pull request #201 from kardapoltsev/master

testing for /var/run/app_name directory instead of file existence in debian and rpm templates
sbt · Mar 23, 2014 · 805e954 · 805e954
2 parents 2a55a05 + 1b640e9
commit 805e954
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/main/resources/com/typesafe/sbt/packager/archetypes/systemv/start-debian-template b/src/main/resources/com/typesafe/sbt/packager/archetypes/systemv/start-debian-template
@@ -25,7 +25,7 @@ RUN_CMD="${{chdir}}/bin/${{app_name}}"
 
 start_daemon() {
     log_daemon_msg "Starting" "${{app_name}}"
-    [ -e "/var/run/${{app_name}}" ] || install -d -o"$DAEMON_USER" -m750 "/var/run/${{app_name}}"
+    [ -d "/var/run/${{app_name}}" ] || install -d -o "$DAEMON_USER" -m750 "/var/run/${{app_name}}"
     start-stop-daemon --background --chdir ${{chdir}} --chuid "$DAEMON_USER" --make-pidfile --pidfile "$PIDFILE" --exec "$RUN_CMD" --start -- $RUN_OPTS
     log_end_msg $?
 }

diff --git a/src/main/resources/com/typesafe/sbt/packager/archetypes/systemv/start-rpm-template b/src/main/resources/com/typesafe/sbt/packager/archetypes/systemv/start-rpm-template
@@ -64,6 +64,7 @@ start() {
     [ $retval -eq 0 ] && touch ${lockfile} && success || failure
 
     # Insert pid into pid file for CentOS killproc function
+    [ -d "/var/run/${{app_name}}" ] || install -d -o "$DAEMON_USER" -m750 "/var/run/${{app_name}}"
     echo
     echo $PID > ${PIDFILE}
     return $retval