Attachment 641786 Details for Bug 872737 – Alternate fix that avoids bash-specifics

[patch] Alternate fix that avoids bash-specifics

redhat-rpm-config-9.1.0-java-repack-spaces-in-filenames.patch (text/plain), 2.05 KB, created by Toshio Ernie Kuratomi on 2012-11-09 19:34:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Toshio Ernie Kuratomi

Created: 2012-11-09 19:34:32 UTC

Size: 2.05 KB

patch

obsolete

>Index: redhat-rpm-config-9.1.0/brp-java-repack-jars
>===================================================================
>--- redhat-rpm-config-9.1.0.orig/brp-java-repack-jars
>+++ redhat-rpm-config-9.1.0/brp-java-repack-jars
>@@ -25,17 +25,19 @@ if [ ! -z "$JARS" ]; then
> 	
> 	# unpack every jar, set the date of the files and directories and 
> 	# repack the jar
>+	OLD_IFS="$IFS"
>+	IFS=$(printf '\n\t')
> 	for j in $JARS ; do
>-		JARNAME=`basename $j`
>-		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
>+		JARNAME=`basename "$j"`
>+		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
>+		pushd "$JTMPDIR" > /dev/null
>+		/usr/bin/unzip -qq -o "$j"
> 		find -type d -exec chmod a+rx {} \;
> 		find -type f -exec chmod a+r {} \;
>-		rm -f $j
>+		rm -f "$j"
> 		
> 		# Create the directories first.
> 		find -type d | LC_ALL=C sort | while read d; do
>@@ -76,24 +78,25 @@ if [ ! -z "$JARS" ]; then
> 		done
> 
> 		# make the jar
>-		pushd $JARDIR > /dev/null
>+		pushd "$JARDIR" > /dev/null
> 
> 		if [ -n "`find -not -name '.'`" ]; then
> 			if [ -e META-INF/MANIFEST.MF ]; then
>-			    /usr/bin/zip -q -X -9 $j META-INF/MANIFEST.MF
>+			    /usr/bin/zip -q -X -9 "$j" META-INF/MANIFEST.MF
> 			fi
>-			find * -not -name '.' | LC_ALL=C sort | /usr/bin/zip -u -q -X -9 $j -@
>+			find * -not -name '.' | LC_ALL=C sort | /usr/bin/zip -u -q -X -9 "$j" -@
> 		else
> 			# Put the empty jar back
>-			touch $j
>+			touch "$j"
> 		fi
> 		popd > /dev/null
> 
> 		# Cleanup.
>-		rm -rf $JTMPDIR
>-		rm -rf $JARDIR
>-		rm -f $TIMEREF
>+		rm -rf "$JTMPDIR"
>+		rm -rf "$JARDIR"
>+		rm -f "$TIMEREF"
> 	done
>+	IFS="$OLD_IFS"
> 
> 	# remove $RPM_BUILD_ROOT/tmp if we created it
> 	if [ $rmtmp -eq 1 ]; then

Actions: View | Diff

Attachments on bug 872737: 637242 | 641786