From 2445dff4e3a486f602c9b6e2c8a3f9f90df71d4a Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Mon, 23 Mar 2015 15:16:11 +0530
Subject: [PATCH] install: install gitlab-shell using the new
 gitlab:shell:install rake task

---
 assets/setup/install | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/assets/setup/install b/assets/setup/install
index 5666428f..996d9e7f 100755
--- a/assets/setup/install
+++ b/assets/setup/install
@@ -37,16 +37,6 @@ sudo -u git -H ln -s ${GITLAB_DATA_DIR}/.ssh /home/git/.ssh
 # create the data store
 sudo -u git -H mkdir -p ${GITLAB_DATA_DIR}
 
-# install gitlab-shell, use local copy if available
-echo "Cloning gitlab-shell v.${GITLAB_SHELL_VERSION}..."
-sudo -u git -H git clone -q -b v${GITLAB_SHELL_VERSION} --depth 1 \
-  https://github.com/gitlabhq/gitlab-shell.git ${GITLAB_SHELL_INSTALL_DIR}
-
-cd ${GITLAB_SHELL_INSTALL_DIR}
-
-sudo -u git -H cp -a config.yml.example config.yml
-sudo -u git -H ./bin/install
-
 # shallow clone gitlab-ce
 echo "Cloning gitlab-ce v.${GITLAB_VERSION}..."
 sudo -u git -H git clone -q -b v${GITLAB_VERSION} --depth 1 \
@@ -93,6 +83,9 @@ if [ -d "${GEM_CACHE_DIR}" ]; then
 fi
 sudo -u git -H bundle install --deployment --without development test aws
 
+# install gitlab-shell
+sudo -u git -H bundle exec rake gitlab:shell:install[v${GITLAB_SHELL_VERSION}] REDIS_URL=unix:/var/run/redis/redis.sock RAILS_ENV=production
+
 # make sure everything in /home/git is owned by the git user
 chown -R git:git /home/git/