- cosmetics; use 'EOF'

[packages/rpm-build-macros.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index 8fdc0032252d59854fac39d66d05dc03dbd3332e..ddc8576de0f6762d8642be8b597f5ee3cc6bc89d 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -835,8 +835,8 @@ if [ "$1" = "0" ] || [ "$2" = "0" ]; then \
 %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 @@ cat > $RPM_BUILD_ROOT%{_bindir}/%5 << EOF \
 . %{_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