ossp-pkg/shiela/shiela-install.sh 1.23 -> 1.24
--- shiela-install.sh 2004/05/05 13:11:43 1.23
+++ shiela-install.sh 2004/05/06 19:45:39 1.24
@@ -371,10 +371,10 @@
CVS_VENDOR=CVSHome.org
fi
case $CVS_VERSION in
- 1.10.[789]* | 1.10.1[0123456789]* | 1.1[1-9].* )
+ 1.1[2-9]* )
;;
* )
- echo "ERROR: CVS has to be at least version 1.10.7"
+ echo "ERROR: CVS has to be at least version 1.12"
exit 1
;;
esac
@@ -411,8 +411,8 @@
cat >$tmpdir/shiela.cfg <<EOT
##
## OSSP shiela - Access Control and Logging Facility for CVS
-## Copyright (c) 2000-2002 Ralf S. Engelschall <rse@engelschall.com>
-## Copyright (c) 2000-2002 The OSSP Project <http://www.ossp.org/>
+## Copyright (c) 2000-2004 Ralf S. Engelschall <rse@engelschall.com>
+## Copyright (c) 2000-2004 The OSSP Project <http://www.ossp.org/>
##
## This file is part of OSSP shiela, an access control and logging
## facility for Concurrent Versions System (CVS) repositories
@@ -477,8 +477,8 @@
Logging {
Reports {
Report mail {
- Content title rule header files log summary details;
- Details diff:mime;
+ Content title rule header files log summary rule details;
+ Details patch:plain;
};
};
};
@@ -586,6 +586,14 @@
run chmod 644 shiela.msg
cvs_file add shiela.msg
+cvs_file tst config
+if [ ".`grep -i UseNewInfoFmtStrings config`" != . ]; then
+ run "cp config config.old && sed -e 's;UseNewInfoFmtStrings=.*;UseNewInfoFmtStrings=yes;' <config.old >config && rm -f config.old"
+else
+ run "(echo ''; echo 'UseNewInfoFmtStrings=yes'; echo '') >>config"
+fi
+cvs_file add config
+
cvs_file tst checkoutlist
run "echo 'shiela.cfg' >>checkoutlist"
run "echo 'shiela' >>checkoutlist"
@@ -597,7 +605,7 @@
cvs_file add rcsinfo
cvs_file tst taginfo
-run "(echo ''; echo 'ALL $V_tool_shiela --hook=taginfo'; echo '') >>taginfo"
+run "(echo ''; echo 'ALL $V_tool_shiela --hook=taginfo %t %o %p %{sv}'; echo '') >>taginfo"
cvs_file add taginfo
if [ ".$CVS_VENDOR" = .RSE ]; then
@@ -611,11 +619,11 @@
fi
cvs_file tst commitinfo
-run "(echo ''; echo 'ALL $V_tool_shiela --hook=commitinfo'; echo '') >>commitinfo"
+run "(echo ''; echo 'ALL $V_tool_shiela --hook=commitinfo %r/%p %s'; echo '') >>commitinfo"
cvs_file add commitinfo
cvs_file tst verifymsg
-run "(echo ''; echo 'DEFAULT $V_tool_shiela --hook=verifymsg'; echo '') >>verifymsg"
+run "(echo ''; echo 'DEFAULT $V_tool_shiela --hook=verifymsg %l'; echo '') >>verifymsg"
cvs_file add verifymsg
if [ ".$CVS_VENDOR" = .RSE ]; then
@@ -624,7 +632,7 @@
flags="sVv"
fi
cvs_file tst loginfo
-run "(echo ''; echo 'ALL $V_tool_shiela --hook=loginfo %{${flags}}'; echo '') >>loginfo"
+run "(echo ''; echo 'ALL $V_tool_shiela --hook=loginfo %p %{${flags}}'; echo '') >>loginfo"
cvs_file add loginfo
run $V_tool_cvs update
|
|
