try to substitute the gitlal-shell dir, use sudo to copy the gitlab service file

Itxaka Serrano · Itxaka Serrano · commit cf06ea9e6da2 · 2014-10-26T20:01:18.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -15,6 +15,7 @@ before_install:
   - sudo apt-get install -y build-essential zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev curl checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev logrotate python-docutils pkg-config cmake git-core
   - psql -c 'CREATE USER git CREATEDB;' -U postgres
   - psql -c 'CREATE DATABASE gitlabhq_production OWNER git;' -U postgres
+  - rvm use 2.1.1
   - scripts/prepare_test_env.sh
   - scripts/install_gitlab.sh
 # command to install dependencies
diff --git a/scripts/install_gitlab.sh b/scripts/install_gitlab.sh
@@ -4,6 +4,7 @@ cd
 git clone --depth=1 https://gitlab.com/gitlab-org/gitlab-ce.git -b 7-2-stable gitlab
 cd /home/travis/gitlab
 sh -c "cat config/gitlab.yml.example | sed 's/port: 80/port: 8080/g' > config/gitlab.yml"
+sh -c "sed -i s_/home/git/gitlab-shell/_/home/travis/gitlab-shell/_g config/gitlab.yml"
 chmod -R u+rwX log/
 chmod -R u+rwX tmp/
 mkdir /home/travis/gitlab-satellites
@@ -22,8 +23,8 @@ bundle install -j4 --deployment --without development test mysql aws
 # install gitlab shell
 bundle exec rake gitlab:shell:install[v1.9.7] REDIS_URL=redis://localhost:6379 RAILS_ENV=production
 echo "yes" |bundle exec rake gitlab:setup RAILS_ENV=production
-cp lib/support/init.d/gitlab /etc/init.d/gitlab
-update-rc.d gitlab defaults 21
+sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
+sudo update-rc.d gitlab defaults 21
 bundle exec rake gitlab:env:info RAILS_ENV=production
 bundle exec rake assets:precompile RAILS_ENV=production
 service gitlab restart
diff --git a/scripts/prepare_test_env.sh b/scripts/prepare_test_env.sh
@@ -1,4 +1,3 @@
 #!/bin/sh
 # install ruby
-rvm use 2.1.1
 bundle --version
