-
Notifications
You must be signed in to change notification settings - Fork 446
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Prevent empty double quotes in start daemon line. #977
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @jan0sch for taking care of this. The expansion looks good to me.
Just remove the formatting changes and this is good to merge.
Travis has sometimes hickups with java8. Build should be green.
@@ -22,47 +22,45 @@ export JAVA_OPTS | |||
# If program manages its own PID file then it | |||
# should declare its location in PIDFILE | |||
if [ -z "$PIDFILE" ]; then | |||
create_pidfile=true | |||
PIDFILE=/var/run/${{app_name}}/running.pid | |||
create_pidfile=true |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why these formatting changes?
else | ||
start-stop-daemon --background --chdir ${{chdir}} --chuid "$DAEMON_USER" --pidfile "$PIDFILE" --startas "$RUN_CMD" --start -- $RUN_OPTS ${stdout_redirect} | ||
fi | ||
log_end_msg $? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's hard to see the actual changes with all the formatting changes. Can you remove the formatting?
The removal of the quotes should fix this if no `stdout_redirect` is set.
I've removed the formatting changes and will commit them in seperate pull request. They were just done to have a consistent indenting in the file. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks a lot :)
The removal of the quotes should fix this if no
stdout_redirect
is set. Also the file had mixed indenting of 2 and 4 spaces, therefore I adjusted it to 2 spaces.This should fix #955 . Travis is green on our fork: https://travis-ci.org/wegtam/sbt-native-packager/branches .