Adjusting the build scripts to correctly load the logstash source and allow people to override it

Author: ph

Gemfile

@@ -2,9 +2,10 @@ source 'https://rubygems.org'
 
 gemspec
 
-logstash_path = "../../logstash"
+logstash_path = ENV["LOGSTASH_PATH"] || "../../logstash"
+use_logstash_source = ENV["LOGSTASH_SOURCE"] && ENV["LOGSTASH_SOURCE"].to_s == "1"
 
-if Dir.exist?(logstash_path) && ENV["LOGSTASH_SOURCE"] == 1
+if Dir.exist?(logstash_path) && use_logstash_source
   gem 'logstash-core', :path => "#{logstash_path}/logstash-core"
   gem 'logstash-core-plugin-api', :path => "#{logstash_path}/logstash-core-plugin-api"
 end

ci/build.sh

@@ -8,11 +8,11 @@
 set -e
 
 echo "Starting build process in: `pwd`"
-./ci/setup.sh
+source ./ci/setup.sh
 
 if [[ -f "ci/run.sh" ]]; then
     echo "Running custom build script in: `pwd`/ci/run.sh"
-    ./ci/run.sh
+    source ./ci/run.sh
 else
     echo "Running default build scripts in: `pwd`/ci/build.sh"
     bundle install