Skip to content

Commit 9832fb0

Browse files
committed
Cleanup to match best practices in ruby and shell
Cleanup both ruby and shell scripts to match various linters' suggestions. Mostly using the new hash syntax, as well as small readability changes. Additionally, update gitignore to not accidentally add in the output from running `rake vendor`
1 parent d8e66cc commit 9832fb0

File tree

9 files changed

+391
-381
lines changed

9 files changed

+391
-381
lines changed

Diff for: .gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@ Gemfile.bak
44
.bundle
55
vendor
66
.idea
7+
lib/logstash-input-http_jars.rb
8+
build/
9+
.gradle/

Diff for: ci/build.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
########################################################
88
set -e
99

10-
echo "Starting build process in: `pwd`"
10+
echo "Starting build process in: $(pwd)"
1111
source ./ci/setup.sh
1212

1313
if [[ -f "ci/run.sh" ]]; then
14-
echo "Running custom build script in: `pwd`/ci/run.sh"
14+
echo "Running custom build script in: $(pwd)/ci/run.sh"
1515
source ./ci/run.sh
1616
else
17-
echo "Running default build scripts in: `pwd`/ci/build.sh"
17+
echo "Running default build scripts in: $(pwd)/ci/build.sh"
1818
bundle install
1919
bundle exec rake vendor
2020
bundle exec rspec spec

Diff for: ci/setup.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
set -e
99
if [ "$LOGSTASH_BRANCH" ]; then
1010
echo "Building plugin using Logstash source"
11-
BASE_DIR=`pwd`
11+
BASE_DIR=$(pwd)
1212
echo "Checking out branch: $LOGSTASH_BRANCH"
13-
git clone -b $LOGSTASH_BRANCH https://github.com/elastic/logstash.git ../../logstash --depth 1
13+
git clone -b "$LOGSTASH_BRANCH" https://github.com/elastic/logstash.git ../../logstash --depth 1
1414
printf "Checked out Logstash revision: %s\n" "$(git -C ../../logstash rev-parse HEAD)"
1515
cd ../../logstash
1616
echo "Building plugins with Logstash version:"
1717
cat versions.yml
1818
echo "---"
1919
# We need to build the jars for that specific version
20-
echo "Running gradle assemble in: `pwd`"
20+
echo "Running gradle assemble in: $(pwd)"
2121
./gradlew assemble
22-
cd $BASE_DIR
22+
cd "$BASE_DIR"
2323
export LOGSTASH_SOURCE=1
2424
else
2525
echo "Building plugin using released gems on rubygems"

Diff for: gradlew

+75-75
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,27 @@
1010
DEFAULT_JVM_OPTS=""
1111

1212
APP_NAME="Gradle"
13-
APP_BASE_NAME=`basename "$0"`
13+
APP_BASE_NAME=$(basename "$0")
1414

1515
# Use the maximum available, or set MAX_FD != -1 to use that value.
1616
MAX_FD="maximum"
1717

1818
warn ( ) {
19-
echo "$*"
19+
echo "$*"
2020
}
2121

2222
die ( ) {
23-
echo
24-
echo "$*"
25-
echo
26-
exit 1
23+
echo
24+
echo "$*"
25+
echo
26+
exit 1
2727
}
2828

2929
# OS specific support (must be 'true' or 'false').
3030
cygwin=false
3131
msys=false
3232
darwin=false
33-
case "`uname`" in
33+
case "$(uname)" in
3434
CYGWIN* )
3535
cygwin=true
3636
;;
@@ -44,119 +44,119 @@ esac
4444

4545
# For Cygwin, ensure paths are in UNIX format before anything is touched.
4646
if $cygwin ; then
47-
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
47+
[ -n "$JAVA_HOME" ] && JAVA_HOME=$(cygpath --unix "$JAVA_HOME")
4848
fi
4949

5050
# Attempt to set APP_HOME
5151
# Resolve links: $0 may be a link
5252
PRG="$0"
5353
# Need this for relative symlinks.
5454
while [ -h "$PRG" ] ; do
55-
ls=`ls -ld "$PRG"`
56-
link=`expr "$ls" : '.*-> \(.*\)$'`
57-
if expr "$link" : '/.*' > /dev/null; then
58-
PRG="$link"
59-
else
60-
PRG=`dirname "$PRG"`"/$link"
61-
fi
55+
ls=$(ls -ld "$PRG")
56+
link=$(expr "$ls" : '.*-> \(.*\)$')
57+
if expr "$link" : '/.*' > /dev/null; then
58+
PRG="$link"
59+
else
60+
PRG=$(dirname "$PRG")"/$link"
61+
fi
6262
done
63-
SAVED="`pwd`"
64-
cd "`dirname \"$PRG\"`/" >&-
65-
APP_HOME="`pwd -P`"
63+
SAVED="$(pwd)"
64+
cd "$(dirname \"$PRG\")/" >&-
65+
APP_HOME="$(pwd -P)"
6666
cd "$SAVED" >&-
6767

6868
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6969

7070
# Determine the Java command to use to start the JVM.
7171
if [ -n "$JAVA_HOME" ] ; then
72-
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
73-
# IBM's JDK on AIX uses strange locations for the executables
74-
JAVACMD="$JAVA_HOME/jre/sh/java"
75-
else
76-
JAVACMD="$JAVA_HOME/bin/java"
77-
fi
78-
if [ ! -x "$JAVACMD" ] ; then
79-
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
80-
81-
Please set the JAVA_HOME variable in your environment to match the
82-
location of your Java installation."
83-
fi
72+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
73+
# IBM's JDK on AIX uses strange locations for the executables
74+
JAVACMD="$JAVA_HOME/jre/sh/java"
75+
else
76+
JAVACMD="$JAVA_HOME/bin/java"
77+
fi
78+
if [ ! -x "$JAVACMD" ] ; then
79+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
80+
81+
Please set the JAVA_HOME variable in your environment to match the
82+
location of your Java installation."
83+
fi
8484
else
85-
JAVACMD="java"
86-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
85+
JAVACMD="java"
86+
command -v java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
8787
88-
Please set the JAVA_HOME variable in your environment to match the
89-
location of your Java installation."
88+
Please set the JAVA_HOME variable in your environment to match the
89+
location of your Java installation."
9090
fi
9191

9292
# Increase the maximum file descriptors if we can.
93-
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
94-
MAX_FD_LIMIT=`ulimit -H -n`
95-
if [ $? -eq 0 ] ; then
96-
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
97-
MAX_FD="$MAX_FD_LIMIT"
98-
fi
99-
ulimit -n $MAX_FD
100-
if [ $? -ne 0 ] ; then
101-
warn "Could not set maximum file descriptor limit: $MAX_FD"
102-
fi
103-
else
104-
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
93+
if [ "$cygwin" = "false" ] && [ "$darwin" = "false" ] ; then
94+
MAX_FD_LIMIT=$(ulimit -H -n)
95+
if [ $? -eq 0 ] ; then
96+
if [ "$MAX_FD" = "maximum" ] || [ "$MAX_FD" = "max" ] ; then
97+
MAX_FD="$MAX_FD_LIMIT"
98+
fi
99+
ulimit -n "$MAX_FD"
100+
if [ $? -ne 0 ] ; then
101+
warn "Could not set maximum file descriptor limit: $MAX_FD"
105102
fi
103+
else
104+
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
105+
fi
106106
fi
107107

108108
# For Darwin, add options to specify how the application appears in the dock
109109
if $darwin; then
110-
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
110+
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
111111
fi
112112

113113
# For Cygwin, switch paths to Windows format before running java
114114
if $cygwin ; then
115-
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
116-
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
115+
APP_HOME=$(cygpath --path --mixed "$APP_HOME")
116+
CLASSPATH=$(cygpath --path --mixed "$CLASSPATH")
117117

118118
# We build the pattern for arguments to be converted via cygpath
119-
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
120-
SEP=""
119+
ROOTDIRSRAW=$(find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null)
120+
SEP=''
121121
for dir in $ROOTDIRSRAW ; do
122-
ROOTDIRS="$ROOTDIRS$SEP$dir"
123-
SEP="|"
122+
ROOTDIRS="$ROOTDIRS$SEP$dir"
123+
SEP="|"
124124
done
125125
OURCYGPATTERN="(^($ROOTDIRS))"
126126
# Add a user-defined pattern to the cygpath arguments
127127
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
128-
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
128+
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
129129
fi
130130
# Now convert the arguments - kludge to limit ourselves to /bin/sh
131131
i=0
132132
for arg in "$@" ; do
133-
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
134-
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
135-
136-
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
137-
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
138-
else
139-
eval `echo args$i`="\"$arg\""
140-
fi
141-
i=$((i+1))
133+
CHECK=$(echo "$arg"|egrep -c "$OURCYGPATTERN" -)
134+
CHECK2=$(echo "$arg"|egrep -c "^-" ) ### Determine if an option
135+
136+
if [ "$CHECK" -ne 0 ] && [ "$CHECK2" -eq 0 ] ; then ### Added a condition
137+
eval "$(echo args$i)"=$(cygpath --path --ignore --mixed "$arg")
138+
else
139+
eval "$(echo args$i)"="\"$arg\""
140+
fi
141+
i=$((i+1))
142142
done
143143
case $i in
144-
(0) set -- ;;
145-
(1) set -- "$args0" ;;
146-
(2) set -- "$args0" "$args1" ;;
147-
(3) set -- "$args0" "$args1" "$args2" ;;
148-
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
149-
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
150-
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
151-
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
152-
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
153-
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
144+
(0) set -- ;;
145+
(1) set -- "$args0" ;;
146+
(2) set -- "$args0" "$args1" ;;
147+
(3) set -- "$args0" "$args1" "$args2" ;;
148+
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
149+
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
150+
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
151+
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
152+
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
153+
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
154154
esac
155-
fi
155+
fi
156156

157157
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
158158
function splitJvmOpts() {
159-
JVM_OPTS=("$@")
159+
JVM_OPTS=("$@")
160160
}
161161
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
162162
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"

0 commit comments

Comments
 (0)