Merge branch '1.5.x'

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

@@ -112,10 +112,7 @@ if [[ "$MODE" == "auto" && -n "$init_script" ]] || [[ "$MODE" == "service" ]]; t
 fi
 
 # Build the pid and log filenames
-if [[ "$identity" == "$init_script" ]] || [[ "$identity" == "$APP_NAME" ]]; then
-  PID_FOLDER="$PID_FOLDER/${identity}"
-  pid_subfolder=$PID_FOLDER
-fi
+PID_FOLDER="$PID_FOLDER/${identity}"
 pid_file="$PID_FOLDER/{{pidFilename:${identity}.pid}}"
 log_file="$LOG_FOLDER/$LOG_FILENAME"
 
@@ -152,9 +149,7 @@ do_start() {
   mkdir -p "$PID_FOLDER" &> /dev/null
   if [[ -n "$run_user" ]]; then
     checkPermissions || return $?
-    if [[ -z "$pid_subfolder" ]]; then
-      chown "$run_user" "$pid_subfolder"
-    fi
+    chown "$run_user" "$PID_FOLDER"
     chown "$run_user" "$pid_file"
     chown "$run_user" "$log_file"
     if [ $USE_START_STOP_DAEMON = true ] && type start-stop-daemon > /dev/null 2>&1; then