packages: publicfile/publicfile.spec - do not embed \r in spec file because...

sparky sparky at pld-linux.org
Mon Feb 7 17:46:06 CET 2011


Author: sparky                       Date: Mon Feb  7 16:46:06 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- do not embed \r in spec file because cvs will eat them

---- Files affected:
packages/publicfile:
   publicfile.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: packages/publicfile/publicfile.spec
diff -u packages/publicfile/publicfile.spec:1.17 packages/publicfile/publicfile.spec:1.18
--- packages/publicfile/publicfile.spec:1.17	Tue Feb 13 09:06:42 2007
+++ packages/publicfile/publicfile.spec	Mon Feb  7 17:46:01 2011
@@ -86,12 +86,15 @@
 echo 21		>env/PORT
 echo 40		>env/MAXCONN
 
-cat>run<<___
+cat > run <<'EOF'
 #!/bin/sh
+CRNL="$(echo -e "\r\n.")"
+CRNL="${CRNL%.}"
 exec 2>&1
-exec envuidgid ftp softlimit -o20 -d50000 tcpserver -vDRHl0 -b20 -c\`cat env/MAXCONN\` -B'220 Features: a p .
-' \`cat env/IP\` \`cat env/PORT\` %{_libdir}/%{name}/bin/ftpd /home/services/%{name}
-___
+exec envuidgid ftp softlimit -o20 -d50000 tcpserver -vDRHl0 -b20 -c$(cat env/MAXCONN) \
+	-B"220 Features: a p .$CRNL" $(cat env/IP) $(cat env/PORT) \
+	%{_libdir}/%{name}/bin/ftpd /home/services/%{name}
+EOF
 
 cat>log/run<<___
 #!/bin/sh
@@ -168,6 +171,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2011/02/07 16:46:01  sparky
+- do not embed \r in spec file because cvs will eat them
+
 Revision 1.17  2007/02/13 08:06:42  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/publicfile/publicfile.spec?r1=1.17&r2=1.18&f=u



More information about the pld-cvs-commit mailing list