SOURCES: rpm.macros - cosmetics; use 'EOF'

[glen]

Author: glen                         Date: Mon May 22 14:27:20 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- cosmetics; use 'EOF'

---- Files affected:
SOURCES:
   rpm.macros (1.297 -> 1.298) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.297 SOURCES/rpm.macros:1.298
--- SOURCES/rpm.macros:1.297	Mon May 22 16:22:52 2006
+++ SOURCES/rpm.macros	Mon May 22 16:27:14 2006
@@ -835,8 +835,8 @@
 %add_jvm_extension	JAVA_LIBDIR=%{buildroot}/%{_javadir}	%{_bindir}/jvmjar -l
 
 %jpackage_script() \
-install -d -m 755 $RPM_BUILD_ROOT%{_bindir}\
-cat > $RPM_BUILD_ROOT%{_bindir}/%5 << EOF \
+install -d $RPM_BUILD_ROOT%{_bindir}\
+cat > $RPM_BUILD_ROOT%{_bindir}/%5 << 'EOF' \
 #!/bin/sh\
 #\
 # %{name} script\
@@ -846,29 +846,29 @@
 . %{_javadir}-utils/java-functions\
 \
 # Source system prefs\
-if [ -f %{_sysconfdir}/java/%{name}.conf ] ; then\
+if [ -f %{_sysconfdir}/java/%{name}.conf ]; then\
     . %{_sysconfdir}/java/%{name}.conf\
 fi\
 \
 # Source user prefs\
-if [ -f \\$HOME/.%{name}rc ] ; then\
-    . \\$HOME/.%{name}rc\
+if [ -f $HOME/.%{name}rc ]; then\
+    . $HOME/.%{name}rc\
 fi\
 \
 # Configuration\
 MAIN_CLASS=%1\
 BASE_FLAGS=%2\
 BASE_OPTIONS=%3\
-BASE_JARS="%(echo %4 | sed -e 's,:, ,g')"\
+BASE_JARS="%(echo %4 | tr ':' ' ')"\
 \
 # Set parameters\
 set_jvm\
-set_classpath \\$BASE_JARS\
-set_flags \\$BASE_FLAGS\
-set_options \\$BASE_OPTIONS\
+set_classpath $BASE_JARS\
+set_flags $BASE_FLAGS\
+set_options $BASE_OPTIONS\
 \
 # Let's start\
-run "\\$@"\
+run "$@"\
 EOF
 
 # vim:ts=8 sw=8 noet
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.297&r2=1.298&f=u