SPECS: ies4linux.spec - kill excess quoting and bashism

[glen]

Author: glen                         Date: Tue May  8 20:25:32 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- kill excess quoting and bashism

---- Files affected:
SPECS:
   ies4linux.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SPECS/ies4linux.spec
diff -u SPECS/ies4linux.spec:1.14 SPECS/ies4linux.spec:1.15
--- SPECS/ies4linux.spec:1.14	Tue May  8 22:08:53 2007
+++ SPECS/ies4linux.spec	Tue May  8 22:25:26 2007
@@ -644,23 +644,23 @@
 EOF
 }
 
-cat > add_file_to_list << EOF
+cat > add_file_to_list << 'EOF'
 #!/bin/sh
 
-	LOCALE="\$1"
-	VERSION="\$2"
-	FULLFILE="\$3"
-	PKGFILE=\`echo "\$FULLFILE" | sed "s:$RPM_BUILD_ROOT::"\`
-	LIST=ie\$VERSION-\$LOCALE.files
+	LOCALE="$1"
+	VERSION="$2"
+	FULLFILE="$3"
+	PKGFILE=`echo "$FULLFILE" | sed "s:$RPM_BUILD_ROOT::"`
+	LIST=ie$VERSION-$LOCALE.files
 
-	if [ -d "\$FULLFILE" ]; then
-		echo "%%dir \\"\$PKGFILE\\"" >> \$LIST
+	if [ -d "$FULLFILE" ]; then
+		echo "%%dir \"$PKGFILE\"" >> $LIST
 	else
-		EXE=`basename "\$PKGFILE" | sed -r 's:.+.(exe):\1:g'`
-		if [ "x\$EXE" == "xEXE" ]; then
-			echo "%%attr(755,root,root) \\"\$PKGFILE\\"" >> \$LIST
+		EXE=`basename "$PKGFILE" | sed -r 's:.+.(exe):\1:g'`
+		if [ "$EXE" = "EXE" ]; then
+			echo "%%attr(755,root,root) \"$PKGFILE\"" >> $LIST
 		else
-			echo "\\"\$PKGFILE\\"" >> \$LIST
+			echo "\"$PKGFILE\"" >> $LIST
 		fi
 	fi
 EOF
@@ -682,18 +682,17 @@
 	find $RPM_BUILD_ROOT%{_installdir}/$LOCALE/ie$VERSION -exec ./add_file_to_list $LOCALE $VERSION '{}' ';'
 	
 	echo "%%attr(755,root,root) %{_bindir}/ie$VERSION-$LOCALE" >> $LIST
-	[ "x$LOCALE" == "xen-US" ] && echo "%%attr(755,root,root) %{_bindir}/ie$VERSION" >> $LIST
+	[ "$LOCALE" = "en-US" ] && echo "%%attr(755,root,root) %{_bindir}/ie$VERSION" >> $LIST
 	echo "%{_desktopdir}/ie$VERSION-$LOCALE.desktop" >> $LIST
 	echo "%%dir %{_installdir}/$LOCALE" >> $LIST
 }
 
 # IE 5, 5.5 built only with en_US locale
 # IE 7 needs more sources for other locales
-for LOCALE in %{locales}
-do
-	[ "x$LOCALE" == "x" ] && continue
+for LOCALE in %{locales}; do
+	[ "$LOCALE" = "" ] && continue
 	OPTS=""
-	[ "xen-US" == "x$LOCALE" ] && OPTS="--install-ie55 --install-ie5"
+	[ "xen-US" = "x$LOCALE" ] && OPTS="--install-ie55 --install-ie5"
 
 	bash ./ies4linux \
 		$OPTS \
@@ -724,7 +723,7 @@
 	gen_desktopfile $LOCALE 6.0
 	ln -sf %{_installdir}/profiles $RPM_BUILD_ROOT%{_installdir}/$LOCALE/ie6/drive_c/windows/profiles
 	
-	if [ "x$LOCALE" == "xen-US" ]; then
+	if [ "$LOCALE" = "en-US" ]; then
 		ln -sf ies4linux $RPM_BUILD_ROOT%{_bindir}/ie5
 		ln -sf ies4linux $RPM_BUILD_ROOT%{_bindir}/ie5-en-US
 		ln -sf ies4linux $RPM_BUILD_ROOT%{_bindir}/ie55
@@ -739,8 +738,8 @@
 	fi
 
 	%if %{with ie7}
-	if [ "x$LOCALE" == "xen-US" ] || [ "x$LOCALE" == "xpl" ]; then
-		[ "x$LOCALE" == "xen-US" ] && ln -sf ies4linux $RPM_BUILD_ROOT%{_bindir}/ie7
+	if [ "$LOCALE" = "en-US" ] || [ "$LOCALE" = "pl" ]; then
+		[ "$LOCALE" = "en-US" ] && ln -sf ies4linux $RPM_BUILD_ROOT%{_bindir}/ie7
 		ln -sf ies4linux $RPM_BUILD_ROOT%{_bindir}/ie7-$LOCALE
 		gen_desktopfile $LOCALE 7
 
@@ -912,6 +911,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2007/05/08 20:25:26  glen
+- kill excess quoting and bashism
+
 Revision 1.14  2007/05/08 20:08:53  pascalek
 - updated to 2.0.5
 - localized packages
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ies4linux.spec?r1=1.14&r2=1.15&f=u