setup: New function to generate series header

Move the code that generates the series file header to a separate
function. This makes the code easier to read due to less folding, and
this is also more efficient than spawning a subshell.

1 files changed, 13 insertions, 9 deletions

diff --git a/quilt/setup.in b/quilt/setup.in
index 8f7cd8c..93c7ce4 100644
--- a/quilt/setup.in
+++ b/quilt/setup.in
@@ -291,6 +291,17 @@ then
 	check_for_existing_files || exit 1
 fi
 
+series_header()
+{
+	local tar_dir=$1 tar_file=$2 dir=$3
+
+	echo "# Patch series file for quilt, created by ${0##*/}"
+	[ -n "$tar_dir" ] && echo "# Sourcedir: $tar_dir"
+	[ -n "$tar_file" ] && echo "# Source: $tar_file"
+	echo "# Patchdir: $dir"
+	echo "#"
+}
+
 while read tag dir arg1 arg2
 do
 	case "$tag" in
@@ -314,15 +325,8 @@ do
 		else
 			if ! [ -e "$prefix$dir/$QUILT_SERIES" ]
 			then
-				(	echo "# Patch series file for quilt," \
-					     "created by ${0##*/}"
-					[ -n "$tar_dir" ] \
-						&& echo "# Sourcedir: $tar_dir"
-					[ -n "$tar_file" ] \
-						&& echo "# Source: $tar_file"
-					echo "# Patchdir: $dir"
-					echo "#"
-				) > "$prefix$dir/$QUILT_SERIES"
+				series_header "$tar_dir" "$tar_file" "$dir" \
+					      > "$prefix$dir/$QUILT_SERIES"
 			fi
 			echo "$arg1" $arg2 >> "$prefix$dir/$QUILT_SERIES"
 		fi