Merge branch 'gitlab-shell-go-symlink' into 'master'

Move gitlab-shell to make Go development easier

See merge request !282

.gitignore

 /gitlab-shell/
+/gitlab-shell
 /.ssh/
 /gitlab-satellites/
 /repositories/
@@ -55,3 +56,4 @@
 /gitaly/
 /gitlab-workhorse/config.toml
 /gitlab-workhorse/.cache
+/go-gitlab-shell

Makefile

 gitlab_repo = https://gitlab.com/gitlab-org/gitlab-ce.git
 gitlab_shell_repo = https://gitlab.com/gitlab-org/gitlab-shell.git
+gitlab_shell_clone_dir = go-gitlab-shell/src/gitlab.com/gitlab-org/gitlab-shell
 gitlab_workhorse_repo = https://gitlab.com/gitlab-org/gitlab-workhorse.git
 gitlab_workhorse_clone_dir = gitlab-workhorse/src/gitlab.com/gitlab-org/gitlab-workhorse
 gitaly_repo = https://gitlab.com/gitlab-org/gitaly.git
@@ -60,10 +61,14 @@ bundler:
 # Set up gitlab-shell
-gitlab-shell-setup: gitlab-shell/.git gitlab-shell/config.yml bundler .gitlab-shell-bundle gitlab-shell/.gitlab_shell_secret
-gitlab-shell/.git:
-	git clone ${gitlab_shell_repo} gitlab-shell
+gitlab-shell-setup: symlink-gitlab-shell ${gitlab_shell_clone_dir}/.git gitlab-shell/config.yml bundler .gitlab-shell-bundle gitlab-shell/.gitlab_shell_secret
+	if [ -x gitlab-shell/bin/compile ] ; then gitlab-shell/bin/compile; fi
+symlink-gitlab-shell:
+	support/symlink-gitlab-shell gitlab-shell ${gitlab_shell_clone_dir}
+
+${gitlab_shell_clone_dir}/.git:
+	git clone ${gitlab_shell_repo} ${gitlab_shell_clone_dir}
 gitlab-shell/config.yml:
 	sed -e "s|/home/git|${gitlab_development_root}|"\

support/symlink-gitlab-shell

+#!/usr/bin/env ruby
+
+require 'fileutils'
+require 'time'
+
+def main(symlink, target)
+  return if File.symlink?(symlink)
+
+  if File.exist?(symlink)
+    # there is an old directory at the symlink location
+    FileUtils.mv(symlink, "#{symlink}.#{Time.now.iso8601}")
+  end
+
+  FileUtils.ln_s(target, symlink)
+end
+
+if ARGV.count != 2
+  abort "Usage: #{$0} SYMLINK TARGET"
+end
+
+main(*ARGV)