Passing args properly, removing redundant execs and renaming wrapper for codedeploy-agent

Author: Gao Han

bin/codedeploy-agent-wrapper

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+
+ruby_versions = ["2.3", "2.2", "2.1", "2.0"]
+actual_ruby_version = RUBY_VERSION.split('.').map{|s|s.to_i}
+left_bound = '2.0.0'.split('.').map{|s|s.to_i}
+right_bound = '2.3.1'.split('.').map{|s|s.to_i}
+ruby_bin = nil
+
+if (actual_ruby_version <=> left_bound) > -1 && (actual_ruby_version <=> right_bound) < 1
+  ruby_bin = "ruby"
+else
+  ruby_versions.each do |i|
+    ruby_dir = "/usr/bin/ruby#{i}"
+    if File.file?(ruby_dir)
+      ruby_bin = ruby_dir
+      break
+    end
+  end
+end
+
+if ruby_bin
+  exec("#{ruby_bin} #{File.join(File.expand_path(File.dirname(__FILE__)), "/codedeploy-agent")} #{ARGV.join(' ')}")
+end
+
+STDERR.puts "No supported ruby version found. Code Deploy Host Agent supports Ruby version of 2.0.x to 2.3.x."
+exit(1)

bin/start-wrapper

@@ -27,7 +27,7 @@ prog="codedeploy-agent"
 USER=""
 AGENT_ROOT="/opt/codedeploy-agent/"
 INSTALLER="/opt/codedeploy-agent/bin/install"
-BIN="/opt/codedeploy-agent/bin/start-wrapper"
+BIN="/opt/codedeploy-agent/bin/codedeploy-agent-wrapper"
 
 start() {
         echo -n $"Starting $prog:"

init.d/codedeploy-agent

@@ -3,8 +3,8 @@ Description=AWS CodeDeploy Host Agent
 
 [Service]
 Type=forking
-ExecStart=/bin/sh -a -c '[ -f /etc/profile ] && source /etc/profile; /opt/codedeploy-agent/bin/start-wrapper start'
-ExecStop=/opt/codedeploy-agent/bin/start-wrapper stop
+ExecStart=/bin/sh -a -c '[ -f /etc/profile ] && source /etc/profile; /opt/codedeploy-agent/bin/codedeploy-agent-wrapper start'
+ExecStop=/opt/codedeploy-agent/bin/codedeploy-agent-wrapper stop
 RemainAfterExit=no
 # Comment out the following line to run the agent as the codedeploy user
 # Note: The user must first exist on the system