diff options
| author | Nick Thomas <nick@gitlab.com> | 2016-11-18 11:52:18 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2016-11-18 11:52:18 +0000 |
| commit | c3adf40fd1f12053737f3f3e30643e974ff2ef44 (patch) | |
| tree | fdab178d2b2318ed2d151190ca0610d6428769c3 | |
| parent | 688ff26df3f288e5cd50096a01014188a5e4011b (diff) | |
| download | gitlab-ce-c3adf40fd1f12053737f3f3e30643e974ff2ef44.tar.gz | |
Remove bashism from scripts/prepare_build.sh
| -rwxr-xr-x | scripts/prepare_build.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index 1eaafdce389..6e3f76b8399 100755 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh retry() { if eval "$@"; then @@ -24,11 +24,12 @@ if [ -f /.dockerenv ] || [ -f ./dockerinit ]; then cp config/resque.yml.example config/resque.yml sed -i 's/localhost/redis/g' config/resque.yml - export FLAGS=(--path vendor --retry 3 --quiet) + export FLAGS="--path vendor --retry 3 --quiet" else - export PATH=$HOME/bin:/usr/local/bin:/usr/bin:/bin + rnd=$(awk 'BEGIN { srand() ; printf("%d\n",rand()*5) }') + export PATH="$HOME/bin:/usr/local/bin:/usr/bin:/bin" cp config/database.yml.mysql config/database.yml sed "s/username\:.*$/username\: runner/" -i config/database.yml sed "s/password\:.*$/password\: 'password'/" -i config/database.yml - sed "s/gitlabhq_test/gitlabhq_test_$((RANDOM/5000))/" -i config/database.yml + sed "s/gitlabhq_test/gitlabhq_test_$rnd/" -i config/database.yml fi |