From 9cb0a533db630b28dc7f4189b487402296239242 Mon Sep 17 00:00:00 2001
From: gaohongtao <hanahmily@gmail.com>
Date: Wed, 28 Feb 2018 22:36:19 +0800
Subject: [PATCH] Convert CRLF to LF

---
 apm-backend-dist/bin/startup.sh       |  2 +-
 apm-backend-dist/bin/webappService.sh | 54 +++++++++++++--------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/apm-backend-dist/bin/startup.sh b/apm-backend-dist/bin/startup.sh
index 57d0c76d71..875c450de7 100644
--- a/apm-backend-dist/bin/startup.sh
+++ b/apm-backend-dist/bin/startup.sh
@@ -7,4 +7,4 @@ WEBAPP_EXE=webappService.sh
 
 exec "$PRGDIR"/"$COLLECTOR_EXE" start
 
-exec "$PRGDIR"/"$COLLECTOR_EXE" start
+exec "$PRGDIR"/"$WEBAPP_EXE" start
diff --git a/apm-backend-dist/bin/webappService.sh b/apm-backend-dist/bin/webappService.sh
index 9c51fb9f3e..d36779a201 100644
--- a/apm-backend-dist/bin/webappService.sh
+++ b/apm-backend-dist/bin/webappService.sh
@@ -1,27 +1,27 @@
-#!/usr/bin/env sh
-
-PRG="$0"
-PRGDIR=`dirname "$PRG"`
-[ -z "$WEBAPP_HOME" ] && $WEBAPP_HOME=`cd "$PRGDIR/.." >/dev/null; pwd`
-
-WEBAPP_LOG_DIR="${$WEBAPP_HOME}/logs"
-JAVA_OPTS=" -Xms256M -Xmx512M"
-JAR_PATH="${$WEBAPP_HOME}/webapp"
-
-if [ ! -d "${$WEBAPP_HOME}/logs" ]; then
-    mkdir -p "${WEBAPP_LOG_DIR}"
-fi
-
-_RUNJAVA=${JAVA_HOME}/bin/java
-[ -z "$JAVA_HOME" ] && _RUNJAVA=java
-
-eval exec "\"$_RUNJAVA\" ${JAVA_OPTS} -jar ${JAR_PATH}/skywalking-webapp.jar \
-        2>${WEBAPP_LOG_DIR}/webapp.log 1> /dev/null &"
-
-if [ $? -eq 0 ]; then
-    sleep 1
-	echo "Skywalking Web Application started successfully!"
-else
-	echo "Skywalking Web Application started failure!"
-	exit 1
-fi
+#!/usr/bin/env sh
+
+PRG="$0"
+PRGDIR=`dirname "$PRG"`
+[ -z "$WEBAPP_HOME" ] && $WEBAPP_HOME=`cd "$PRGDIR/.." >/dev/null; pwd`
+
+WEBAPP_LOG_DIR="${WEBAPP_HOME}/logs"
+JAVA_OPTS=" -Xms256M -Xmx512M"
+JAR_PATH="${WEBAPP_HOME}/webapp"
+
+if [ ! -d "${WEBAPP_HOME}/logs" ]; then
+    mkdir -p "${WEBAPP_LOG_DIR}"
+fi
+
+_RUNJAVA=${JAVA_HOME}/bin/java
+[ -z "$JAVA_HOME" ] && _RUNJAVA=java
+
+eval exec "\"$_RUNJAVA\" ${JAVA_OPTS} -jar ${JAR_PATH}/skywalking-webapp.jar \
+        2>${WEBAPP_LOG_DIR}/webapp.log 1> /dev/null &"
+
+if [ $? -eq 0 ]; then
+    sleep 1
+	echo "Skywalking Web Application started successfully!"
+else
+	echo "Skywalking Web Application started failure!"
+	exit 1
+fi
-- 
GitLab