Author: rjung
Date: Thu Oct 23 11:18:55 2014
New Revision: 1633792
URL: http://svn.apache.org/r1633792
Log:
Platform compatibility tweaks for release script:
- "sh" does not necessarily know about "export var=val".
Plain bourne shell only allows "var=val; export var".
- "sed -i" is platform specific, e.g. Solaris doesn't
have it. Need to work with a temporary interim file.
- switch form sed deleting a fixed number of files to awk
deleting everything until the first occurance of "Preface".
Modified:
tomcat/native/branches/1.1.x/jnirelease.sh
Modified: tomcat/native/branches/1.1.x/jnirelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/jnirelease.sh?rev=1633792&r1=1633791&r2=1633792&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/jnirelease.sh (original)
+++ tomcat/native/branches/1.1.x/jnirelease.sh Thu Oct 23 11:18:55 2014
@@ -31,7 +31,8 @@ TCTRUNK_SVNBASE=https://svn.apache.org/r
# Set the environment variable that stops OSX storing extended
# attributes in tar archives etc. with a file starting with ._
-export COPYFILE_DISABLE=1
+COPYFILE_DISABLE=1
+export COPYFILE_DISABLE
for o
do
@@ -193,10 +194,11 @@ if [ $? -ne 0 ]; then
echo ""
exit 1
fi
-# Remove first 25 lines from converted file which contains
-# page navigation data.
-# Remember to increase the lines when new file is added to news.
-sed -i '' '1,25d' ../../CHANGELOG.txt
+# Remove page navigation data from converted file.
+cp -p ../../CHANGELOG.txt ../../CHANGELOG.txt.tmp
+awk '/Preface/ {o=1} o>0' ../../CHANGELOG.txt.tmp > ../../CHANGELOG.txt
+rm ../../CHANGELOG.txt.tmp
+
cd "$top"
mv ${JKJNIDIST}/jni/build/docs ${JKJNIDIST}/jni/docs
rm -rf ${JKJNIDIST}/jni/build
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
