File tree Expand file tree Collapse file tree 1 file changed +5
-5
lines changed Expand file tree Collapse file tree 1 file changed +5
-5
lines changed Original file line number Diff line number Diff line change 2
2
set -ex
3
3
4
4
# Set the build dir to ./ if not set by travis
5
- BUILD_DIR=./
6
- if [ -z " $TRAVIS_BUILD_DIR " ]; then
5
+ BUILD_DIR=$PWD
6
+ if [[ -z " $TRAVIS_BUILD_DIR " && " $TRAVIS_BUILD_DIR " -ne " " ] ]; then
7
7
BUILD_DIR=$TRAVIS_BUILD_DIR
8
8
fi
9
9
@@ -23,8 +23,8 @@ setup_es() {
23
23
fi
24
24
rm -f elasticsearch/config/scripts || true
25
25
mkdir -p elasticsearch/config/scripts
26
- cp $TRAVIS_BUILD_DIR /spec/fixtures/scripts/groovy/* elasticsearch/config/scripts
27
- cp $TRAVIS_BUILD_DIR /spec/fixtures/scripts/painless/* elasticsearch/config/scripts
26
+ cp $BUILD_DIR /spec/fixtures/scripts/groovy/* elasticsearch/config/scripts
27
+ cp $BUILD_DIR /spec/fixtures/scripts/painless/* elasticsearch/config/scripts
28
28
}
29
29
30
30
start_es () {
@@ -73,7 +73,7 @@ start_nginx() {
73
73
if [[ " $INTEGRATION " != " true" ]]; then
74
74
bundle exec rspec -fd spec
75
75
else
76
- if [ " $1 " -eq " " ]; then
76
+ if [[ " $1 " -eq " " ] ]; then
77
77
spec_path=" spec"
78
78
else
79
79
spec_path=" $1 "
You can’t perform that action at this time.
0 commit comments