From c1c38e145832a5d94c713cae2c6dddfbb380ce5c Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sun, 4 Nov 2018 10:56:13 +0000 Subject: [PATCH] git-srv-admin.sh update-descriptions: Use summary instead of description Signed-off-by: Jan Lindemann --- scripts/git-srv-admin.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/git-srv-admin.sh b/scripts/git-srv-admin.sh index b5a62fe1..3e4c354e 100644 --- a/scripts/git-srv-admin.sh +++ b/scripts/git-srv-admin.sh @@ -94,6 +94,13 @@ create_repo() git init --bare --shared=0640 || fatal "git init failed" } +read_project_metadata() +{ + local pd="$1" + local field="$2" + git -C $pd show HEAD:make/project.conf | sed -n "/^\[$field\]/,/^\[/ p" | grep -v '\[' | cat -s | sed '${/^$/d;}' +} + update_descriptions() { [ -d $pdir ] || return 0 @@ -106,7 +113,8 @@ update_descriptions() [ -d "$proj" ] || fatal "Failed to find project $pdir/$proj" local tmp=`mktemp /tmp/$myname-XXXXXXX` local descr=$proj/description - git -C $proj show HEAD:make/project.conf | sed -n '/^\[description\]/,/^\[/ p' | grep -v '\[' | cat -s | sed '${/^$/d;}' > $tmp + read_project_metadata $proj summary > $tmp + [ -s "$tmp" ] || read_project_metadata $proj description > $tmp if [ -s "$tmp" ] && ! diff -q "$tmp" "$descr" >/dev/null 2>&1; then chown --reference=$proj $tmp chmod 640 $tmp