[javatools] 02/08: Trim trailing spaces
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 ba632e5cc84ded9d80b1a734eaaaf8ae0fbae99a
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Jul 22 18:45:48 2016 +0200
Trim trailing spaces
---
debian/control | 4 ++--
java-arch.sh | 10 ++++------
java-propose-classpath | 6 +++---
jh_build | 2 +-
jh_classpath | 4 ++--
jh_depends | 16 ++++++++--------
jh_exec | 4 ++--
jh_installjavadoc | 12 ++++++------
jh_installlibs | 10 +++++-----
jh_linkjars | 6 +++---
jh_makepkg | 18 +++++++++---------
jh_repack | 2 +-
12 files changed, 46 insertions(+), 48 deletions(-)
diff --git a/debian/control b/debian/control
index db9449a..5d036c2 100644
--- a/debian/control
+++ b/debian/control
@@ -48,7 +48,7 @@ Description: Helper scripts for packaging Java programs
a provided spec so that the resultant jar files will work with
jarwrapper-enabled packages.
.
- jh_exec looks for symlinks to jars which should be executable
+ jh_exec looks for symlinks to jars which should be executable
and makes them executable
.
jh_build builds java files to jars for you.
@@ -69,7 +69,7 @@ Description: Helper scripts for packaging Java programs
/usr/share/javahelper/java-vars.mk provides a selection of useful
variables such as various JVM paths and the JVM name for the architecture
.
- /usr/share/javahelper/java-arch.sh converts Debian architecture
+ /usr/share/javahelper/java-arch.sh converts Debian architecture
names into java names to locate libjvm.so in non-make build systems
.
javahelper provides CDBS and dh macros so that it can be used with those
diff --git a/java-arch.sh b/java-arch.sh
index d9f9dd3..c33513a 100755
--- a/java-arch.sh
+++ b/java-arch.sh
@@ -13,7 +13,7 @@ else
DPKG_ARCH="$1"
fi
-case $DPKG_ARCH in
+case $DPKG_ARCH in
arm64)
echo aarch64
;;
@@ -28,16 +28,14 @@ case $DPKG_ARCH in
;;
hppa)
echo parisc
- ;;
+ ;;
sparc64)
echo sparc
- ;;
+ ;;
sh4)
echo sh
;;
- *)
+ *)
echo $DPKG_ARCH
;;
esac
-
-
diff --git a/java-propose-classpath b/java-propose-classpath
index 1cda14a..fc303f4 100755
--- a/java-propose-classpath
+++ b/java-propose-classpath
@@ -30,7 +30,7 @@ dodepends()
`readlink -f "$j"`"
done
fi
- echo "$realdepends" | sort -biu | xargs
+ echo "$realdepends" | sort -biu | xargs
}
ARGS="c" parseargs "$@"
@@ -55,7 +55,7 @@ else
jar xf "$JAR" >/dev/null
classes="`find -name '*.class' -exec jcf-dump --print-constants java.lang.Object \{\} \; | grep 'Class name:' | cut -d'"' -f2| sed 's/\[\[*L\(.*\);/\1/;s/$/.class/' |sort -u | grep -v ^java[/\.]`"
-
+
cd "$OLDDIR"
rm -rf "$TEMPDIR"
@@ -64,7 +64,7 @@ else
if [ ! -f $j ]; then
classes2="$classes2 $j"
fi
- done
+ done
export SRC="${ARGV[$i]}"
dodepends $classes2
diff --git a/jh_build b/jh_build
index 3ac2d7c..4ecc65f 100755
--- a/jh_build
+++ b/jh_build
@@ -75,7 +75,7 @@ function dobuild()
ext="`basename "$jarfile" .jar`"
srcdirs=()
srcfiles=()
- while [ -n "$1" ]; do
+ while [ -n "$1" ]; do
if [ -f "$1" ]; then
srcfiles+=("$1")
elif [ -d "$1" ]; then
diff --git a/jh_classpath b/jh_classpath
index 3112d2b..3024f98 100755
--- a/jh_classpath
+++ b/jh_classpath
@@ -13,8 +13,8 @@ syntax()
echo -e "\t-i --indep: act on all Arch: all packages"
echo -e "\t-a --arch: act on all Arch-specific packages"
echo -e "\t-s --same-arch: alias of --arch for compatibility with debhelper"
- echo -e "\t-p<package> --package=<package>: package to act on (default=all)"
- echo -e "\t-P<packagedir> --tmpdir=<package>: package directory (default=\$CWD/debian/package)"
+ echo -e "\t-p<package> --package=<package>: package to act on (default=all)"
+ echo -e "\t-P<packagedir> --tmpdir=<package>: package directory (default=\$CWD/debian/package)"
echo -e "\t-c<classpath> --classpath=<classpath>: The classpath to set on the jar(s)"
echo -e "\t-v --verbose: show more information while running"
echo -e "\t-n --no-act: don't actually do anything, just print the results"
diff --git a/jh_depends b/jh_depends
index 8b0d755..2611e47 100755
--- a/jh_depends
+++ b/jh_depends
@@ -12,15 +12,15 @@ syntax()
echo -e "Options:"
echo -e "\t-h --help: show this text"
echo -e "\t-V --version: print the version"
- echo -e "\t-p<package> --package=<package>: package to act on (default=all)"
- echo -e "\t-P<packagedir> --tmpdir=<package>: package directory (default=\$CWD/debian/package)"
+ echo -e "\t-p<package> --package=<package>: package to act on (default=all)"
+ echo -e "\t-P<packagedir> --tmpdir=<package>: package directory (default=\$CWD/debian/package)"
echo -e "\t-v --verbose: show more information while running"
echo -e "\t-i --indep: work on all indep packages"
echo -e "\t-a --arch: work on all arch-specific packages"
echo -e "\t-s --same-arch: alias of --arch for compatibility with debhelper"
echo -e "\t-n --no-act: don't actually do anything, just print the results"
echo -e "\t-j[<jvm>] --jvm[=<jvm>]: Options are: default, headless, gcj, open, open6, open7 or open8. Can be a space-separated list."
- echo -e "\t-X<package> --exclude=<package>: don't add this package to depends"
+ echo -e "\t-X<package> --exclude=<package>: don't add this package to depends"
echo -e ""
echo -e "Note: \"headless\" (for --jvm) affects other values and alternatives (e.g. java7-runtime becomes"
echo -e " java7-runtime-headless) and \"default\" cannot be used with any other value except \"headless\""
@@ -134,7 +134,7 @@ for p in $PACKAGES; do
jar xf "$i"
classversion=`getclassversion $classversion .`
JARDEPS="$JARDEPS `extractline META-INF/MANIFEST.MF Class-Path`"
- if grep ^Main-Class META-INF/MANIFEST.MF >/dev/null; then
+ 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"`"
fi
@@ -152,7 +152,7 @@ for p in $PACKAGES; do
for i in $JARDEPS; do
# Strip out leading "file://"
i="$(echo "$i" | perl -pe 's{^\s*file://*}{/}')"
- if [ -e "$i" ]; then
+ if [ -e "$i" ]; then
realjar="`readlink -f "$i"`"
elif [ -e "/usr/share/java/$i" ]; then
realjar="`readlink -f "/usr/share/java/$i"`"
@@ -166,7 +166,7 @@ for p in $PACKAGES; do
fi
if [ -f $OLDDIR/debian/$j$realjar ]; then
LOCALDEBDEPS="$LOCALDEBDEPS $j (>= \${source:Version})"
- else
+ else
NEWJARDEPS="$NEWJARDEPS $realjar"
fi
else
@@ -190,8 +190,8 @@ for p in $PACKAGES; do
fi
done
DEBDEPS="$LOCALDEBDEPS $REALDEBDEPS"
-
-
+
+
if [ -n "$VERBOSE" ]; then
echo "Found Debs:" $DEBDEPS
fi
diff --git a/jh_exec b/jh_exec
index d031661..65635aa 100755
--- a/jh_exec
+++ b/jh_exec
@@ -15,8 +15,8 @@ syntax()
echo -e "\t-i --indep: run for all Arch: all packages"
echo -e "\t-a --arch: run for all Arch-specific packages"
echo -e "\t-s --same-arch: alias of --arch for compatibility with debhelper"
- echo -e "\t-p<package> --package=<package>: package to act on (default=all)"
- echo -e "\t-P<packagedir> --tmpdir=<package>: package directory (default=\$CWD/debian/package)"
+ echo -e "\t-p<package> --package=<package>: package to act on (default=all)"
+ echo -e "\t-P<packagedir> --tmpdir=<package>: package directory (default=\$CWD/debian/package)"
echo -e "\t-v --verbose: show more information while running"
echo -e "\t-n --no-act: don't actually do anything, just print the results"
exit 1
diff --git a/jh_installjavadoc b/jh_installjavadoc
index be848be..7dab62b 100755
--- a/jh_installjavadoc
+++ b/jh_installjavadoc
@@ -13,11 +13,11 @@ syntax()
echo -e "\t-i --indep: act on all Arch: all packages"
echo -e "\t-a --arch: act on all Arch-specific packages"
echo -e "\t-s --same-arch: alias of --arch for compatibility with debhelper"
- echo -e "\t-p<package> --package=<package>: package to act on (default=all)"
- echo -e "\t-P<packagedir> --tmpdir=<package>: package directory (default=\$CWD/debian/package)"
+ echo -e "\t-p<package> --package=<package>: package to act on (default=all)"
+ echo -e "\t-P<packagedir> --tmpdir=<package>: package directory (default=\$CWD/debian/package)"
echo -e "\t-v --verbose: show more information while running"
echo -e "\t-n --no-act: don't actually do anything, just print the results"
- echo -e "\t-A<author> --author=<author>: Author of the javadoc"
+ echo -e "\t-A<author> --author=<author>: Author of the javadoc"
exit 1
}
@@ -28,7 +28,7 @@ dh_testdir
VERBOSE="`getarg v verbose`"
AUTHOR="`getarg A author`"
-function installjavadoc()
+function installjavadoc()
{
package="$1"
@@ -84,8 +84,8 @@ END
if [ "$ARGC" != "0" ] ; then
-
- p="`firstpackage`"
+
+ p="`firstpackage`"
installjavadoc "$p" "${ARGV[0]}" "${ARGV[1]}"
exit 0
fi
diff --git a/jh_installlibs b/jh_installlibs
index 0760145..d8ce242 100755
--- a/jh_installlibs
+++ b/jh_installlibs
@@ -13,8 +13,8 @@ syntax()
echo -e "\t-i --indep: act on all Arch: all packages"
echo -e "\t-a --arch: act on all Arch-specific packages"
echo -e "\t-s --same-arch: alias of --arch for compatibility with debhelper"
- echo -e "\t-p<package> --package=<package>: package to act on (default=all)"
- echo -e "\t-P<packagedir> --tmpdir=<package>: package directory (default=\$CWD/debian/package)"
+ echo -e "\t-p<package> --package=<package>: package to act on (default=all)"
+ echo -e "\t-P<packagedir> --tmpdir=<package>: package directory (default=\$CWD/debian/package)"
echo -e "\t-v --verbose: show more information while running"
echo -e "\t-n --no-act: don't actually do anything, just print the results"
echo -e "\t--no-mangle: don't try and sanitize the upstream version number"
@@ -68,8 +68,8 @@ function processjar()
}
if [ "$ARGC" != "0" ] ; then
-
- p="`firstpackage`"
+
+ p="`firstpackage`"
PACKAGEDIR="`getarg P tmpdir`"
if [ -z "$PACKAGEDIR" ]; then
PACKAGEDIR="`pwd`/debian/$p"
@@ -109,7 +109,7 @@ for p in `findpackages`; do
IFS='
'
for i in `cat "$FILE"`; do
- processjar "$p" "$i"
+ processjar "$p" "$i"
done
diff --git a/jh_linkjars b/jh_linkjars
index 9cee97f..b8e54a4 100755
--- a/jh_linkjars
+++ b/jh_linkjars
@@ -31,7 +31,7 @@ function findjars()
fi
JARS=""
- for d in $BDS; do
+ for d in $BDS; do
j="$(dpkg -L $d | grep "^/usr/share/java/.*\.jar$")"
k=""
if [ -n "$j" ] && [ `getarg t transitive` ]; then
@@ -46,7 +46,7 @@ function unlinkjars()
{
target="$1"
JARS="`findjars`"
-
+
for j in $JARS; do
if [ -n "`getarg n no-act`" ]; then
echo rm -f "$target/`basename "$j"`"
@@ -84,7 +84,7 @@ function linkjars()
dh_testdir
if [ "$ARGC" != "0" ] ; then
-
+
target="${ARGV[0]}"
if [ -n "`getarg u unlink`" ]; then
unlinkjars "$target"
diff --git a/jh_makepkg b/jh_makepkg
index d150034..040aa8c 100755
--- a/jh_makepkg
+++ b/jh_makepkg
@@ -98,15 +98,15 @@ if [ -n "`getarg e email`" ]; then
DEBEMAIL="`getarg e email`"
fi
-if [ -z "$DEBEMAIL" ]; then
+if [ -z "$DEBEMAIL" ]; then
DEBEMAIL="$EMAIL"
fi
-if [ -z "$DEBEMAIL" ] && [ -f /etc/mailname ]; then
+if [ -z "$DEBEMAIL" ] && [ -f /etc/mailname ]; then
DEBEMAIL="`whoami`@`cat /etc/mailname`"
fi
-if [ -z "$DEBEMAIL" ]; then
+if [ -z "$DEBEMAIL" ]; then
DEBEMAIL="`whoami`@`hostname --fqdn`"
fi
@@ -114,11 +114,11 @@ if [ -n "`getarg m maintainer`" ]; then
DEBFULLNAME="`getarg m maintainer`"
fi
-if [ -z "$DEBFULLNAME" ]; then
+if [ -z "$DEBFULLNAME" ]; then
DEBFULLNAME="$NAME"
fi
-if [ -z "$DEBFULLNAME" ] ; then
+if [ -z "$DEBFULLNAME" ] ; then
DEBFULLNAME="$(getent passwd $(whoami) | cut -d: -f5 | cut -d, -f1)"
fi
@@ -146,7 +146,7 @@ else
TYPE="app"
echo "Selected: Application"
;;
- esac
+ esac
fi
case $TYPE in
"app")
@@ -268,7 +268,7 @@ esac
YEAR=$(date +%Y)
mkdir -p debian
-mkdir debian/source
+mkdir debian/source
echo '3.0 (quilt)' > debian/source/format
cat > debian/control <<END
Source: $SRCPACKAGE
@@ -326,7 +326,7 @@ END
echo $COMPAT > debian/compat
-EDITOR=true DEBFULLNAME="$DEBFULLNAME" DEBEMAIL="$DEBEMAIL" dch --create --package $SRCPACKAGE --newversion ${VERSION}-1 --distribution unstable --urgency low
+EDITOR=true DEBFULLNAME="$DEBFULLNAME" DEBEMAIL="$DEBEMAIL" dch --create --package $SRCPACKAGE --newversion ${VERSION}-1 --distribution unstable --urgency low
cat > debian/rules <<END
#!/usr/bin/make -f
@@ -349,7 +349,7 @@ END
echo ${SRCPACKAGE}.jar src > debian/javabuild
;;
esac
-
+
case $TYPE in
"app")
echo "$SRCPACKAGE.jar usr/share/$BINPACKAGE" > debian/$BINPACKAGE.install
diff --git a/jh_repack b/jh_repack
index f9c5348..ca9bb41 100755
--- a/jh_repack
+++ b/jh_repack
@@ -75,7 +75,7 @@ fi
rm -f "$TARBALL"
-case "$TYPE" in
+case "$TYPE" in
gzip)
tar zcf "$TARBALL" *
;;
--
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