This is an automated email from the ASF dual-hosted git repository. mawiesne pushed a commit to branch OPENNLP-1675-Address-ShellCheck-warnings-for-shell-scripts in repository https://gitbox.apache.org/repos/asf/opennlp.git
commit 6f015f713c31b798482a07bbb12b3523a30046a4 Author: Martin Wiesner <[email protected]> AuthorDate: Thu Dec 19 21:54:42 2024 +0100 OPENNLP-1675 Address ShellCheck warnings for shell scripts --- opennlp-distr/src/main/bin/opennlp | 20 ++++++++++---------- .../src/main/bin/morfologik-addon | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/opennlp-distr/src/main/bin/opennlp b/opennlp-distr/src/main/bin/opennlp index 31a0966c..8375e2d6 100755 --- a/opennlp-distr/src/main/bin/opennlp +++ b/opennlp-distr/src/main/bin/opennlp @@ -25,37 +25,37 @@ PRG="$0" while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` + ls=$(ls -ld "$PRG") + link=$(expr "$ls" : '.*-> \(.*\)$') if expr "$link" : '/.*' > /dev/null; then PRG="$link" else - PRG="`dirname "$PRG"`/$link" + PRG="$(dirname "$PRG")/$link" fi done -saveddir=`pwd` +saveddir=$(pwd) -OPENNLP_HOME=`dirname "$PRG"`/.. +OPENNLP_HOME=$(dirname "$PRG")/.. # make it fully qualified -OPENNLP_HOME=`cd "$OPENNLP_HOME" && pwd` +OPENNLP_HOME=$(cd "$OPENNLP_HOME" && pwd) -cd "$saveddir" +cd "$saveddir" || exit if [ -z "$JAVACMD" ] ; then if [ -n "$JAVA_HOME" ] ; then JAVACMD="$JAVA_HOME/bin/java" else - JAVACMD="`which java`" + JAVACMD="$(which java)" fi fi -CLASSPATH=$(echo $OPENNLP_HOME/lib/*.jar | tr ' ' ':') +CLASSPATH=$(echo "$OPENNLP_HOME"/lib/*.jar | tr ' ' ':') unset HEAP if [ -n "$JAVA_HEAP" ] ; then HEAP="-Xmx$JAVA_HEAP" fi -$JAVACMD $HEAP -Dlog4j.configurationFile="$OPENNLP_HOME/conf/log4j2.xml" -cp "$CLASSPATH" opennlp.tools.cmdline.CLI $@ +$JAVACMD "$HEAP" -Dlog4j.configurationFile="$OPENNLP_HOME/conf/log4j2.xml" -cp "$CLASSPATH" opennlp.tools.cmdline.CLI "$@" diff --git a/opennlp-morfologik-addon/src/main/bin/morfologik-addon b/opennlp-morfologik-addon/src/main/bin/morfologik-addon index 2042652f..1266fa27 100755 --- a/opennlp-morfologik-addon/src/main/bin/morfologik-addon +++ b/opennlp-morfologik-addon/src/main/bin/morfologik-addon @@ -25,32 +25,32 @@ PRG="$0" while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` + ls=$(ls -ld "$PRG") + link=$(expr "$ls" : '.*-> \(.*\)$') if expr "$link" : '/.*' > /dev/null; then PRG="$link" else - PRG="`dirname "$PRG"`/$link" + PRG="$(dirname "$PRG")/$link" fi done -saveddir=`pwd` +saveddir=$(pwd) -OPENNLP_HOME=`dirname "$PRG"`/.. +OPENNLP_HOME=$(dirname "$PRG")/.. # make it fully qualified -OPENNLP_HOME=`cd "$OPENNLP_HOME" && pwd` +OPENNLP_HOME=$(cd "$OPENNLP_HOME" && pwd) -cd "$saveddir" +cd "$saveddir" || exit if [ -z "$JAVACMD" ] ; then if [ -n "$JAVA_HOME" ] ; then JAVACMD="$JAVA_HOME/bin/java" else - JAVACMD="`which java`" + JAVACMD="$(which java)" fi fi -CLASSPATH=$(echo $OPENNLP_HOME/lib/*.jar | tr ' ' ':') +CLASSPATH=$(echo "$OPENNLP_HOME"/lib/*.jar | tr ' ' ':') -$JAVACMD -Xmx1024m -Dlog4j.configurationFile="$OPENNLP_HOME/conf/log4j2.xml" -cp "$CLASSPATH" opennlp.morfologik.cmdline.CLI $@ +$JAVACMD -Xmx1024m -Dlog4j.configurationFile="$OPENNLP_HOME/conf/log4j2.xml" -cp "$CLASSPATH" opennlp.morfologik.cmdline.CLI "$@"
