From 15c7282dd38151b2e897e116cb03898ebbc6a0f2 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Sat, 20 Sep 2014 14:56:02 +0530
Subject: [PATCH] install: moved the apt-get blocks

---
 assets/setup/install | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/assets/setup/install b/assets/setup/install
index 31e146be..efe3ed66 100755
--- a/assets/setup/install
+++ b/assets/setup/install
@@ -11,6 +11,16 @@ GITLAB_SHELL_INSTALL_DIR="/home/git/gitlab-shell"
 SETUP_DIR="/app/setup"
 GEM_CACHE_DIR="${SETUP_DIR}/cache"
 
+# rebuild apt cache
+apt-get update
+
+# install build dependencies for gem installation
+apt-get install -y gcc g++ make patch pkg-config cmake \
+  libc6-dev ruby-dev \
+  libmysqlclient-dev libpq-dev zlib1g-dev libyaml-dev libssl-dev \
+  libgdbm-dev libreadline-dev libncurses5-dev libffi-dev \
+  libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev
+
 # remove the host keys generated during openssh-server installation
 rm -rf /etc/ssh/ssh_host_*_key /etc/ssh/ssh_host_*_key.pub
 
@@ -68,16 +78,6 @@ sudo -u git -H ln -s ${GITLAB_DATA_DIR}/uploads public/uploads
 # create production log
 sudo -u git -H touch log/production.log
 
-# rebuild apt cache
-apt-get update
-
-# install build dependencies for gem installation
-apt-get install -y gcc g++ make patch pkg-config cmake \
-  libc6-dev ruby-dev \
-  libmysqlclient-dev libpq-dev zlib1g-dev libyaml-dev libssl-dev \
-  libgdbm-dev libreadline-dev libncurses5-dev libffi-dev \
-  libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev
-
 # install gems required by gitlab, use local cache if available
 if [ -d "${GEM_CACHE_DIR}" ]; then
   mv ${GEM_CACHE_DIR} vendor/
@@ -85,16 +85,6 @@ if [ -d "${GEM_CACHE_DIR}" ]; then
 fi
 sudo -u git -H bundle install --deployment --without development test aws
 
-# purge build dependencies
-apt-get purge -y --auto-remove gcc g++ make patch pkg-config cmake \
-  libc6-dev ruby2.1-dev \
-  libmysqlclient-dev libpq-dev zlib1g-dev libyaml-dev libssl-dev \
-  libgdbm-dev libreadline-dev libncurses5-dev libffi-dev \
-  libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev
-
-# cleanup
-rm -rf /var/lib/apt/lists/*
-
 # make sure everything in /home/git is owned by the git user
 chown -R git:git /home/git/
 
@@ -177,3 +167,13 @@ autorestart=true
 stdout_logfile=/var/log/supervisor/%(program_name)s.log
 stderr_logfile=/var/log/supervisor/%(program_name)s.log
 EOF
+
+# purge build dependencies
+apt-get purge -y --auto-remove gcc g++ make patch pkg-config cmake \
+  libc6-dev ruby2.1-dev \
+  libmysqlclient-dev libpq-dev zlib1g-dev libyaml-dev libssl-dev \
+  libgdbm-dev libreadline-dev libncurses5-dev libffi-dev \
+  libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev
+
+# cleanup
+rm -rf /var/lib/apt/lists/*