From b46e105a617cbe0a798b7f8f5d32be5b8fa6d862 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Fri, 23 Oct 2015 13:45:19 +0530
Subject: [PATCH] install.sh: pick cache dir based on `GITLAB_VERSION`

---
 assets/setup/install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/setup/install.sh b/assets/setup/install.sh
index dfb0a84b..57d64266 100755
--- a/assets/setup/install.sh
+++ b/assets/setup/install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-GEM_CACHE_DIR="${SETUP_DIR}/cache"
+GEM_CACHE_DIR="${SETUP_DIR}/cache.${GITLAB_VERSION}"
 
 # add golang1.5 ppa
 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv B0B8B106A0CA2F79FBB616DBA65E2E5D742A38EE
@@ -78,7 +78,7 @@ sudo -HEu ${GITLAB_USER} cp config/initializers/smtp_settings.rb.sample config/i
 
 # install gems required by gitlab, use local cache if available
 if [[ -d ${GEM_CACHE_DIR} ]]; then
-  mv ${GEM_CACHE_DIR} vendor/
+  mv ${GEM_CACHE_DIR} vendor/cache
   chown -R ${GITLAB_USER}:${GITLAB_USER} vendor/cache
 fi
 sudo -HEu ${GITLAB_USER} bundle install -j$(nproc) --deployment --without development test aws