[javatools] 06/08: Indentation
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Jul 27 08:35:13 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository javatools.
commit 886d293dce0c195c40a46268cea022665e98fa12
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Jul 22 19:46:28 2016 +0200
Indentation
---
jh_depends | 85 +++++++++++++++++++++++++++++++-------------------------------
1 file changed, 43 insertions(+), 42 deletions(-)
diff --git a/jh_depends b/jh_depends
index 2611e47..68c259c 100755
--- a/jh_depends
+++ b/jh_depends
@@ -122,11 +122,11 @@ for p in $PACKAGES; do
echo "Searching" $JARS
fi
- [ -n "$TEMPDIR" ] && rm -rf "$TEMPDIR/"*
- cd "$TEMPDIR"
+ [ -n "$TEMPDIR" ] && rm -rf "$TEMPDIR/"*
+ cd "$TEMPDIR"
JARDEPS=""
- classversion=0
+ classversion=0
for i in $JARS; do
if [ -x "$i" ]; then
WRAPPER="true"
@@ -136,7 +136,7 @@ for p in $PACKAGES; do
JARDEPS="$JARDEPS `extractline META-INF/MANIFEST.MF Class-Path`"
if grep ^Main-Class META-INF/MANIFEST.MF >/dev/null; then
JHOME="`extractline META-INF/MANIFEST.MF Debian-Java-Home`"
- JVM="`home-to-jvm "$JHOME"`"
+ JVM="`home-to-jvm "$JHOME"`"
fi
[ -n "$TEMPDIR" ] && rm -rf "$TEMPDIR/"*
done
@@ -148,32 +148,33 @@ for p in $PACKAGES; do
LOCALDEBDEPS=""
DEBDEPS=""
- NEWJARDEPS=""
+ NEWJARDEPS=""
for i in $JARDEPS; do
# Strip out leading "file://"
i="$(echo "$i" | perl -pe 's{^\s*file://*}{/}')"
- if [ -e "$i" ]; then
- realjar="`readlink -f "$i"`"
- elif [ -e "/usr/share/java/$i" ]; then
- realjar="`readlink -f "/usr/share/java/$i"`"
- else
- realjar="$i"
- fi
+ if [ -e "$i" ]; then
+ realjar="`readlink -f "$i"`"
+ elif [ -e "/usr/share/java/$i" ]; then
+ realjar="`readlink -f "/usr/share/java/$i"`"
+ else
+ realjar="$i"
+ fi
+
for j in $PACKAGES; do
- if ! grep "$j" <<< "$EXCLUDES" > /dev/null; then
- if [ -n "$VERBOSE" ]; then
- echo "Checking: " $OLDDIR/debian/$j$realjar
- fi
- if [ -f $OLDDIR/debian/$j$realjar ]; then
- LOCALDEBDEPS="$LOCALDEBDEPS $j (>= \${source:Version})"
- else
- NEWJARDEPS="$NEWJARDEPS $realjar"
- fi
- else
- if [ -n "$VERBOSE" ]; then
- echo "Excluding package $j from depends"
- fi
- fi
+ if ! grep "$j" <<< "$EXCLUDES" > /dev/null; then
+ if [ -n "$VERBOSE" ]; then
+ echo "Checking: " $OLDDIR/debian/$j$realjar
+ fi
+ if [ -f $OLDDIR/debian/$j$realjar ]; then
+ LOCALDEBDEPS="$LOCALDEBDEPS $j (>= \${source:Version})"
+ else
+ NEWJARDEPS="$NEWJARDEPS $realjar"
+ fi
+ else
+ if [ -n "$VERBOSE" ]; then
+ echo "Excluding package $j from depends"
+ fi
+ fi
done
done
@@ -181,15 +182,15 @@ for p in $PACKAGES; do
DEBDEPS="$DEBDEPS `dpkg -S $NEWJARDEPS 2>/dev/null | grep -v ^$p: | cut -d: -f1 | sort -u`"
fi
- REALDEBDEPS=""
- for d in $DEBDEPS; do
- if grep "$d" <<< "$EXCLUDES" > /dev/null; then
- echo "Excluding package $d from depends"
- else
- REALDEBDEPS="$REALDEBDEPS $d"
- fi
- done
- DEBDEPS="$LOCALDEBDEPS $REALDEBDEPS"
+ REALDEBDEPS=""
+ for d in $DEBDEPS; do
+ if grep "$d" <<< "$EXCLUDES" > /dev/null; then
+ echo "Excluding package $d from depends"
+ else
+ REALDEBDEPS="$REALDEBDEPS $d"
+ fi
+ done
+ DEBDEPS="$LOCALDEBDEPS $REALDEBDEPS"
if [ -n "$VERBOSE" ]; then
@@ -203,13 +204,13 @@ for p in $PACKAGES; do
JVM="`getarg j jvm`"
fi
- if [ -n "$WRAPPER" ] && [ -z "$JVM" ]; then
- if [ -n "$JAVA_HOME" ]; then
- JVM="`home-to-jvm "$JAVA_HOME"`"
- else
- JVM="default"
- fi
- fi
+ if [ -n "$WRAPPER" ] && [ -z "$JVM" ]; then
+ if [ -n "$JAVA_HOME" ]; then
+ JVM="`home-to-jvm "$JAVA_HOME"`"
+ else
+ JVM="default"
+ fi
+ fi
if [ -n "$JVM" ]; then
if echo $JVM | grep -q headless ; then
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/javatools.git
More information about the pkg-java-commits
mailing list