Author: bdelacretaz
Date: Wed Jun 4 00:18:01 2008
New Revision: 663014
URL: http://svn.apache.org/viewvc?rev=663014&view=rev
Log:
SLING-493 - ignore #comments in notice fragment files
Modified:
incubator/sling/trunk/etc/notice/mknotice
Modified: incubator/sling/trunk/etc/notice/mknotice
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/mknotice?rev=663014&r1=663013&r2=663014&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/mknotice (original)
+++ incubator/sling/trunk/etc/notice/mknotice Wed Jun 4 00:18:01 2008
@@ -87,7 +87,8 @@
generate_notice() {
set_project_name
[[ -n "$PROJECT_NAME" ]] || fatal "Project name not found"
- echo $PROJECT_NAME
+ echo $PROJECT_NAME
+ echo ""
cat $GLOBAL_PREFIX || fatal "prefix output failed"
(
collect_deps | map_deps | sort -u | while read notice
@@ -106,8 +107,8 @@
echo ""
echo ""
done
- [[ -f $LOCAL_NOTICE ]] && egrep '^($|[^#])' $LOCAL_NOTICE
- ) | cat -s
+ [[ -f $LOCAL_NOTICE ]] && cat $LOCAL_NOTICE
+ ) | egrep '^($|[^#])' | cat -s
}
generate_notice
