You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2017/12/27 12:31:45 UTC
[03/12] ant git commit: whitespace adjustment in scripts
whitespace adjustment in scripts
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/a044dadb
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/a044dadb
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/a044dadb
Branch: refs/heads/master
Commit: a044dadb4b40cf50b9498a9d9f6f73f301544cc5
Parents: 603124a
Author: twogee <g....@gmail.com>
Authored: Tue Dec 19 17:35:33 2017 +0100
Committer: twogee <g....@gmail.com>
Committed: Tue Dec 19 17:35:33 2017 +0100
----------------------------------------------------------------------
bootstrap.sh | 11 +++++----
build.sh | 4 +--
src/etc/testcases/taskdefs/exec/parrot.sh | 9 ++++---
src/script/ant | 34 +++++++++++++-------------
src/script/complete-ant-cmd.pl | 2 +-
src/script/runant.pl | 2 +-
src/tests/antunit/taskdefs/exec/parrot.sh | 9 ++++---
7 files changed, 37 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/a044dadb/bootstrap.sh
----------------------------------------------------------------------
diff --git a/bootstrap.sh b/bootstrap.sh
index c58fbb3..35f1fb8 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -16,11 +16,12 @@
# limitations under the License.
# OS specific support. $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
+cygwin=false
+darwin=false
case "`uname`" in
CYGWIN*)
- cygwin=true ;;
+ cygwin=true
+ ;;
Darwin*)
darwin=true
if [ -z "$JAVA_HOME" ]; then
@@ -60,7 +61,7 @@ fi
# JAVA_HOME/jre/sh for java and rmid
# JAVA_HOME/sh for javac and rmic
if [ -z "$JAVAC" ]; then
- if [ -n "$JAVA_HOME" ]; then
+ if [ -n "$JAVA_HOME" ]; then
if [ -x "$JAVA_HOME/sh/javac" ]; then
JAVAC=${JAVA_HOME}/sh/javac;
else
@@ -71,7 +72,7 @@ if [ -z "$JAVAC" ]; then
fi
fi
if [ -z "$JAVACMD" ]; then
- if [ -n "$JAVA_HOME" ]; then
+ if [ -n "$JAVA_HOME" ]; then
if [ -x "$JAVA_HOME/jre/sh/java" ]; then
JAVACMD=$JAVA_HOME/jre/sh/java
else
http://git-wip-us.apache.org/repos/asf/ant/blob/a044dadb/build.sh
----------------------------------------------------------------------
diff --git a/build.sh b/build.sh
index 544f147..ee8e571 100755
--- a/build.sh
+++ b/build.sh
@@ -16,8 +16,8 @@
# limitations under the License.
# OS specific support. $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
+cygwin=false
+darwin=false
case "`uname`" in
CYGWIN*)
cygwin=true
http://git-wip-us.apache.org/repos/asf/ant/blob/a044dadb/src/etc/testcases/taskdefs/exec/parrot.sh
----------------------------------------------------------------------
diff --git a/src/etc/testcases/taskdefs/exec/parrot.sh b/src/etc/testcases/taskdefs/exec/parrot.sh
index 2467f23..c064c38 100755
--- a/src/etc/testcases/taskdefs/exec/parrot.sh
+++ b/src/etc/testcases/taskdefs/exec/parrot.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -12,8 +13,8 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-for arg in "$@" ; do
- echo $arg out
- sleep 1
- echo $arg err>&2
+for arg in "$@"; do
+ echo $arg out
+ sleep 1
+ echo $arg err>&2
done
http://git-wip-us.apache.org/repos/asf/ant/blob/a044dadb/src/script/ant
----------------------------------------------------------------------
diff --git a/src/script/ant b/src/script/ant
index a0ca99a..a15026b 100644
--- a/src/script/ant
+++ b/src/script/ant
@@ -27,7 +27,7 @@ if [ -z "$PROTECT_NL" ]; then
os=`uname -s`
rel=`uname -r`
# heirloom bourne-shell used by Solaris 10 is not POSIX
- # it lacks features necessary to protect trailing NL from subshell trimming
+ # it lacks features necessary to protect trailing NL from subshell trimming
if [ "$os" = SunOS -a "$rel" = "5.10" ]; then
PROTECT_NL=false
fi
@@ -40,11 +40,11 @@ for arg in "$@"; do
use_jikes_default=true
elif [ "$arg" = "--execdebug" ]; then
ant_exec_debug=true
- elif [ my"$arg" = my"--h" -o my"$arg" = my"--help" ]; then
+ elif [ my"$arg" = my"--h" -o my"$arg" = my"--help" ]; then
show_help=true
ant_exec_args="$ant_exec_args -h"
else
- if [ my"$arg" = my"-h" -o my"$arg" = my"-help" ]; then
+ if [ my"$arg" = my"-h" -o my"$arg" = my"-help" ]; then
show_help=true
fi
@@ -69,9 +69,9 @@ for arg in "$@"; do
quoted_arg="\"$esc_arg\""
if $ant_exec_debug; then
- # using printf to avoid echo line continuation and escape interpretation
- printf "arg : %s\n" "$arg"
- printf "quoted_arg: %s\n" "$quoted_arg"
+ # using printf to avoid echo line continuation and escape interpretation
+ printf "arg : %s\n" "$arg"
+ printf "quoted_arg: %s\n" "$quoted_arg"
fi
ant_exec_args="$ant_exec_args $quoted_arg"
fi
@@ -84,9 +84,9 @@ if $no_config; then
else
# load system-wide ant configuration (ONLY if ANT_HOME has NOT been set)
if [ -z "$ANT_HOME" -o "$ANT_HOME" = "/usr/share/ant" ]; then
- if [ -f "/etc/ant.conf" ]; then
- . /etc/ant.conf
- fi
+ if [ -f "/etc/ant.conf" ]; then
+ . /etc/ant.conf
+ fi
fi
# load user ant configuration
@@ -133,9 +133,9 @@ case "`uname`" in
fi
fi
;;
- MINGW*)
- mingw=true
- ;;
+ MINGW*)
+ mingw=true
+ ;;
esac
if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ]; then
@@ -187,7 +187,7 @@ if [ -z "$JAVACMD" ]; then
else
JAVACMD=`which java 2> /dev/null `
if [ -z "$JAVACMD" ]; then
- JAVACMD=java
+ JAVACMD=java
fi
fi
fi
@@ -264,9 +264,9 @@ if $rpm_mode && [ -x /usr/bin/build-classpath ]; then
else
# not using rpm_mode; use launcher to determine classpaths
if [ -z "$LOCALCLASSPATH" ]; then
- LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar
+ LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar
else
- LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar:$LOCALCLASSPATH
+ LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar:$LOCALCLASSPATH
fi
fi
@@ -368,8 +368,8 @@ else
fi
ant_exec_command="exec \"\$JAVACMD\" $ANT_OPTS -classpath \"\$LOCALCLASSPATH\" -Dant.home=\"\$ANT_HOME\" -Dant.library.dir=\"\$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"\$CLASSPATH\""
if $ant_exec_debug; then
- # using printf to avoid echo line continuation and escape interpretation confusion
- printf "%s\n" "$ant_exec_command $ant_exec_args"
+ # using printf to avoid echo line continuation and escape interpretation confusion
+ printf "%s\n" "$ant_exec_command $ant_exec_args"
fi
eval "$ant_exec_command $ant_exec_args"
http://git-wip-us.apache.org/repos/asf/ant/blob/a044dadb/src/script/complete-ant-cmd.pl
----------------------------------------------------------------------
diff --git a/src/script/complete-ant-cmd.pl b/src/script/complete-ant-cmd.pl
index c1b7ba1..47e3c0e 100644
--- a/src/script/complete-ant-cmd.pl
+++ b/src/script/complete-ant-cmd.pl
@@ -83,7 +83,7 @@ sub getTargets {
my $cacheFile = $buildFile;
$cacheFile =~ s|(.*/)?(.*)|${1}.ant-targets-${2}|;
if ((!-e $cacheFile) || (-z $cacheFile) || (-M $buildFile) < (-M $cacheFile)) {
- open(CACHE, '>'.$cacheFile) || die "can\'t write $cacheFile: $!\n";
+ open(CACHE, '>' . $cacheFile) || die "can\'t write $cacheFile: $!\n";
open(HELP, "$antCmd -projecthelp -debug -buildfile '$buildFile'|") || return();
my %targets;
while (<HELP>) {
http://git-wip-us.apache.org/repos/asf/ant/blob/a044dadb/src/script/runant.pl
----------------------------------------------------------------------
diff --git a/src/script/runant.pl b/src/script/runant.pl
index 8089b56..0945f25 100644
--- a/src/script/runant.pl
+++ b/src/script/runant.pl
@@ -70,7 +70,7 @@ my $oncygwin = ($^O eq "cygwin");
#here I assume ":" 'cept on win32, dos, and netware. Add extra tests here as needed.
my $s = ":";
if (($^O eq "MSWin32") || ($^O eq "dos") || $oncygwin || $onnetware) {
- $s=";";
+ $s = ";";
}
#build up standard classpath
http://git-wip-us.apache.org/repos/asf/ant/blob/a044dadb/src/tests/antunit/taskdefs/exec/parrot.sh
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/exec/parrot.sh b/src/tests/antunit/taskdefs/exec/parrot.sh
index 2467f23..c064c38 100755
--- a/src/tests/antunit/taskdefs/exec/parrot.sh
+++ b/src/tests/antunit/taskdefs/exec/parrot.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -12,8 +13,8 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-for arg in "$@" ; do
- echo $arg out
- sleep 1
- echo $arg err>&2
+for arg in "$@"; do
+ echo $arg out
+ sleep 1
+ echo $arg err>&2
done