Skip to content

Cleanup to match best practices in ruby and shell #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
teancom wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Cleanup to match best practices in ruby and shell #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ Gemfile.bak
.bundle
vendor
.idea
lib/logstash-input-http_jars.rb
build/
.gradle/
14 changes: 7 additions & 7 deletions ci/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
########################################################
set -e

echo "Starting build process in: `pwd`"
echo "Starting build process in: $(pwd)"
source ./ci/setup.sh

if [[ -f "ci/run.sh" ]]; then
echo "Running custom build script in: `pwd`/ci/run.sh"
source ./ci/run.sh
echo "Running custom build script in: $(pwd)/ci/run.sh"
Copy link
Member

@jsvd jsvd Oct 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if we're indenting these lines we should indent the remaining ones in the block

source ./ci/run.sh
else
echo "Running default build scripts in: `pwd`/ci/build.sh"
bundle install
bundle exec rake vendor
bundle exec rspec spec
echo "Running default build scripts in: $(pwd)/ci/build.sh"
bundle install
bundle exec rake vendor
bundle exec rspec spec
fi
8 changes: 4 additions & 4 deletions ci/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@
set -e
if [ "$LOGSTASH_BRANCH" ]; then
echo "Building plugin using Logstash source"
BASE_DIR=`pwd`
BASE_DIR=$(pwd)
echo "Checking out branch: $LOGSTASH_BRANCH"
git clone -b $LOGSTASH_BRANCH https://github.com/elastic/logstash.git ../../logstash --depth 1
git clone -b "$LOGSTASH_BRANCH" https://github.com/elastic/logstash.git ../../logstash --depth 1
printf "Checked out Logstash revision: %s\n" "$(git -C ../../logstash rev-parse HEAD)"
cd ../../logstash
echo "Building plugins with Logstash version:"
cat versions.yml
echo "---"
# We need to build the jars for that specific version
echo "Running gradle assemble in: `pwd`"
echo "Running gradle assemble in: $(pwd)"
./gradlew assemble
cd $BASE_DIR
cd "$BASE_DIR"
export LOGSTASH_SOURCE=1
else
echo "Building plugin using released gems on rubygems"
Expand Down
150 changes: 75 additions & 75 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading