root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Merge branch '1.3.x'

This commit is contained in:
Andy Wilkinson 2016-05-13 11:41:58 +01:00
parent 2b006aacb3 4c65e5e704
commit 183613a5ca
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/loader/tools/launch.script
View File

@ -130,8 +130,7 @@ else
exit 1 exit 1
fi fi
# Build actual command to execute arguments=(-Dsun.misc.URLClassPath.disableJarChecking=true $JAVA_OPTS -jar $jarfile $RUN_ARGS "$@")
command="$javaexe -Dsun.misc.URLClassPath.disableJarChecking=true $JAVA_OPTS -jar $jarfile $RUN_ARGS $*"
# Action functions # Action functions
start() { start() {
@ -152,7 +151,6 @@ do_start() {
chown "$run_user" "$pid_file" chown "$run_user" "$pid_file"
chown "$run_user" "$log_file" chown "$run_user" "$log_file"
if [ $USE_START_STOP_DAEMON = true ] && type start-stop-daemon > /dev/null 2>&1; then if [ $USE_START_STOP_DAEMON = true ] && type start-stop-daemon > /dev/null 2>&1; then
arguments=(-Dsun.misc.URLClassPath.disableJarChecking=true $JAVA_OPTS -jar $jarfile $RUN_ARGS "$@")
start-stop-daemon --start --quiet \ start-stop-daemon --start --quiet \
--chuid "$run_user" \ --chuid "$run_user" \
--name "$identity" \ --name "$identity" \
@ -164,12 +162,12 @@ do_start() {
>> "$log_file" 2>&1 >> "$log_file" 2>&1
await_file "$pid_file" await_file "$pid_file"
else else
su -s /bin/sh -c "$command >> \"$log_file\" 2>&1 & echo \$!" "$run_user" > "$pid_file" su -s /bin/sh -c "$javaexe $(printf "\"%s\" " "${arguments[@]}") >> \"$log_file\" 2>&1 & echo \$!" "$run_user" > "$pid_file"
fi fi
pid=$(cat "$pid_file") pid=$(cat "$pid_file")
else else
checkPermissions || return $? checkPermissions || return $?
$command >> "$log_file" 2>&1 & "$javaexe" "${arguments[@]}" >> "$log_file" 2>&1 &
pid=$! pid=$!
disown $pid disown $pid
echo "$pid" > "$pid_file" echo "$pid" > "$pid_file"
@ -219,7 +217,7 @@ status() {
run() { run() {
pushd "$(dirname "$jarfile")" > /dev/null pushd "$(dirname "$jarfile")" > /dev/null
$command "$javaexe" "${arguments[@]}"
result=$? result=$?
popd > /dev/null popd > /dev/null
return "$result" return "$result"