Replace USER with CODEDEPLOY_USER to avoid env var conflict

Author: Gao Han

init.d/codedeploy-agent

@@ -22,18 +22,18 @@ RETVAL=0
 [ -f /etc/profile ] && [ "`stat --format '%U %G' /etc/profile`" == "root root" ] && source /etc/profile
 
 prog="codedeploy-agent"
-# Modify the following USER variable to run the codedeploy process as a non-root user
+# Modify the following CODEDEPLOY_USER variable to run the codedeploy process as a non-root user
 # Note: You also need to chown /opt/codedeploy /var/log/aws 
-USER=""
+CODEDEPLOY_USER=""
 AGENT_ROOT="/opt/codedeploy-agent/"
 INSTALLER="/opt/codedeploy-agent/bin/install"
 BIN="/opt/codedeploy-agent/bin/codedeploy-agent-wrapper"
 
 start() {
         echo -n $"Starting $prog:"
         cd $AGENT_ROOT
-        if [ $USER ]; then
-          nohup sudo -i -u $USER $BIN start >/dev/null </dev/null 2>&1 # Try to start the server
+        if [ $CODEDEPLOY_USER ]; then
+          nohup sudo -i -u $CODEDEPLOY_USER $BIN start >/dev/null </dev/null 2>&1 # Try to start the server
         else
           nohup $BIN start >/dev/null </dev/null 2>&1  # Try to start the server
         fi
@@ -43,8 +43,8 @@ start() {
 stop() {
         echo -n $"Stopping $prog:"
         cd $AGENT_ROOT
-        if [ $USER ]; then
-          nohup sudo -i -u $USER $BIN stop >/dev/null </dev/null 2>&1  # Try to stop the server
+        if [ $CODEDEPLOY_USER ]; then
+          nohup sudo -i -u $CODEDEPLOY_USER $BIN stop >/dev/null </dev/null 2>&1  # Try to stop the server
         else
           nohup $BIN stop >/dev/null </dev/null 2>&1  # Try to stop the server
         fi
@@ -54,8 +54,8 @@ stop() {
 restart() {
         echo -n $"Restarting $prog:"
         cd $AGENT_ROOT
-        if [ $USER ]; then
-          nohup sudo -i -u $USER $BIN restart >/dev/null </dev/null 2>&1  # Try to restart the server
+        if [ $CODEDEPLOY_USER ]; then
+          nohup sudo -i -u $CODEDEPLOY_USER $BIN restart >/dev/null </dev/null 2>&1  # Try to restart the server
         else
           nohup $BIN restart >/dev/null </dev/null 2>&1  # Try to restart the server
         fi
@@ -64,8 +64,8 @@ restart() {
 
 status() {
         cd $AGENT_ROOT
-        if [ $USER ]; then
-          sudo -i -u $USER $BIN status # Status of the server
+        if [ $CODEDEPLOY_USER ]; then
+          sudo -i -u $CODEDEPLOY_USER $BIN status # Status of the server
         else
           $BIN status # Status of the server
         fi