Merge branch 'master' of github.com:gitlabhq/gitlab-ci-runner

.hound.yml

+StringLiterals:
+  EnforcedStyle: single_quotes
+  Enabled: true

README.md

@@ -45,7 +45,7 @@ sudo apt-get install -y wget curl gcc libxml2-dev libxslt-dev libcurl4-openssl-d
 b) MacOSX (make sure you have [homebrew](http://brew.sh/) installed)
 ```bash
-sudo brew install icu4c
+brew install icu4c
 ```
 Install Ruby from source:
@@ -130,7 +130,7 @@ It will remove the runner's information from the coordinator and remove the give
 ```
 exit;
 cd /home/gitlab_ci_runner/gitlab-ci-runner
-sudo cp ./lib/support/upstart/gitlab-ci-runner.conf /etc/init.d/
+sudo cp ./lib/support/upstart/gitlab-ci-runner.conf /etc/init/
 ```

lib/setup.rb

@@ -14,7 +14,7 @@ module GitlabCi
     def build_config
       url = ENV['CI_SERVER_URL']
       unless url
-        puts 'Please enter the gitlab-ci coordinator URL (e.g. http://gitlab-ci.org:3000/ )'
+        puts 'Please enter the gitlab-ci coordinator URL (e.g. http://gitlab-ci.org/ )'
         url = gets.chomp
       end

lib/support/init.d/gitlab_ci_runner.default.example

@@ -22,4 +22,4 @@ INIT_LOG="/var/log/gitlab_ci_runner.log"
 # runners_pid_path defines a file in which the individual runners place their pids.
 # The default is "$pid_path/runners.pid"
-RUNNERS_PID="$PID_PATH/runners.pid"
+RUNNER_PID="$PID_PATH/runners.pid"