From 20a45694f9a52eaabee80bdf8fdc2423b300529d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 27 Apr 2014 11:58:18 +0300 Subject: [PATCH] Trim trailing whitespace --- brp-java-repack-jars | 16 ++++++++-------- kmodtool | 24 ++++++++++++------------ macros | 5 ++--- macros.kmp | 1 - modalias.prov | 8 ++++---- redhat-rpm-config.spec | 14 +++++++------- rpmrc | 1 - 7 files changed, 33 insertions(+), 36 deletions(-) diff --git a/brp-java-repack-jars b/brp-java-repack-jars index 7f62adc..93696fc 100755 --- a/brp-java-repack-jars +++ b/brp-java-repack-jars @@ -14,16 +14,16 @@ if [ ! -x /usr/bin/unzip ]; then fi JARS=`find $RPM_BUILD_ROOT -type f -name \*.jar -not -size 0` -if [ ! -z "$JARS" ]; then - +if [ ! -z "$JARS" ]; then + # make $RPM_BUILD_ROOT/tmp if it doesn't exist rmtmp=0 if [ ! -x "$RPM_BUILD_ROOT/tmp" ]; then mkdir -p $RPM_BUILD_ROOT/tmp rmtmp=1 fi - - # unpack every jar, set the date of the files and directories and + + # unpack every jar, set the date of the files and directories and # repack the jar OLD_IFS="$IFS" IFS=$(printf '\n\t') @@ -32,17 +32,17 @@ if [ ! -z "$JARS" ]; then JTMPDIR=`mktemp -d -p $RPM_BUILD_ROOT/tmp "$JARNAME.tmpdir.XXXXXXXXXX"` || exit 1 JARDIR=`mktemp -d -p $RPM_BUILD_ROOT/tmp "$JARNAME.jardir.XXXXXXXXXX"` || exit 1 TIMEREF=`mktemp -p $RPM_BUILD_ROOT/tmp "$JARNAME.timeref.XXXXXXXXXX"` || exit 1 - + pushd "$JTMPDIR" > /dev/null /usr/bin/unzip -qq -o "$j" find -type d -exec chmod a+rx,u+w {} \; find -type f -exec chmod a+r,u+w {} \; rm -f "$j" - + # Create the directories first. find -type d | LC_ALL=C sort | while read d; do mkdir -p "$JARDIR/$d" - done + done # Get the modtime from the newest ChangeLog. If the project # doesn't have a ChangeLog, Jan 1, 1970 will be used. @@ -61,7 +61,7 @@ if [ ! -z "$JARS" ]; then DATE="$TMPDATE" fi done - fi + fi fi # move the contents over to the a new directory in order and set diff --git a/kmodtool b/kmodtool index affad54..1308af2 100755 --- a/kmodtool +++ b/kmodtool @@ -88,16 +88,16 @@ get_rpmtemplate () if [ ! -z "$kmp_release" ]; then echo "Release: %{kmp_release}" fi - + if [ ! -z "$kmp" ]; then echo "%global _use_internal_dependency_generator 0" fi - + cat < /dev/null || : fi EOF - + if [ ! -z "$kmp" ]; then cat < /var/run/rpm-kmod-${kmod_name}${dashvariant}-modules EOF - + fi - + cat < /dev/null || : EOF - + if [ ! -z "$kmp" ]; then cat <&2 exit 2 fi - + for variant in "$@" ; do if [ "default" == "$variant" ]; then @@ -210,15 +210,15 @@ You called: ${invocation} Usage: ${myprog}